network clear all WIP

4 years ago · ec447b2e2e
parent 2e5ffc3196
commit ec447b2e2e
40 changed files with 44739 additions and 334 deletions
--- a/.husky/_/husky.sh
+++ b/.husky/_/husky.sh
@ -0,0 +1,30 @@
+#!/bin/sh
+if [ -z "$husky_skip_init" ]; then
+  debug () {
+    [ "$HUSKY_DEBUG" = "1" ] && echo "husky (debug) - $1"
+  }
+
+  readonly hook_name="$(basename "$0")"
+  debug "starting $hook_name..."
+
+  if [ "$HUSKY" = "0" ]; then
+    debug "HUSKY env variable is set to 0, skipping hook"
+    exit 0
+  fi
+
+  if [ -f ~/.huskyrc ]; then
+    debug "sourcing ~/.huskyrc"
+    . ~/.huskyrc
+  fi
+
+  export readonly husky_skip_init=1
+  sh -e "$0" "$@"
+  exitCode="$?"
+
+  if [ $exitCode != 0 ]; then
+    echo "husky - $hook_name hook exited with code $exitCode (error)"
+    exit $exitCode
+  fi
+
+  exit 0
+fi
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@ -354,7 +354,7 @@
  "beginYourSession": "Begin<br />your<br />Session.",
  "welcomeToYourSession": "Welcome to your Session",
  "newSession": "New Session",
-  "searchFor...": "Search for conversations, contacts, and messages",
+  "searchFor...": "Search for conversations or contacts",
  "enterSessionID": "Enter Session ID",
  "enterSessionIDOfRecipient": "Enter Session ID or ONS name of recipient",
  "usersCanShareTheir...": "Users can share their Session ID by going into their account settings and tapping \"Share Session ID\", or by sharing their QR code.",
--- a/app/sql.js
+++ b/app/sql.js
@ -41,7 +41,6 @@ module.exports = {
  getAllOpenGroupV1Conversations,
  getAllOpenGroupV2Conversations,
  getPubkeysInPublicConversation,
-  getAllConversationIds,
  getAllGroupsInvolvingId,
  removeAllConversations,

@ -65,8 +64,6 @@ module.exports = {
  getMessageBySenderAndServerTimestamp,
  getMessageIdsFromServerIds,
  getMessageById,
-  getAllMessages,
-  getAllMessageIds,
  getMessagesBySentAt,
  getSeenMessagesByHashList,
  getLastHashBySnode,
@ -156,7 +153,15 @@ function getSQLCipherIntegrityCheck(db) {

 function keyDatabase(db, key) {
  // https://www.zetetic.net/sqlcipher/sqlcipher-api/#key
-  db.pragma(`key = "x'${key}'"`);
+  // If the password isn't hex then we need to derive a key from it
+
+  const deriveKey = HEX_KEY.test(key);
+
+  const value = deriveKey ? `'${key}'` : `"x'${key}'"`;
+
+  const pragramToRun = `key = ${value}`;
+
+  db.pragma(pragramToRun);
 }

 function switchToWAL(db) {
@ -260,7 +265,7 @@ function openAndMigrateDatabase(filePath, key) {
    switchToWAL(db2);

    // Because foreign key support is not enabled by default!
-    db2.pragma('foreign_keys = ON');
+    db2.pragma('foreign_keys = OFF');

    return db2;
  } catch (error) {
@ -272,13 +277,7 @@ function openAndMigrateDatabase(filePath, key) {
  }
 }

-const INVALID_KEY = /[^0-9A-Fa-f]/;
 function openAndSetUpSQLCipher(filePath, { key }) {
-  const match = INVALID_KEY.exec(key);
-  if (match) {
-    throw new Error(`setupSQLCipher: key '${key}' is not valid`);
-  }
-
  return openAndMigrateDatabase(filePath, key);
 }

@ -834,6 +833,7 @@ const LOKI_SCHEMA_VERSIONS = [
  updateToLokiSchemaVersion12,
  updateToLokiSchemaVersion13,
  updateToLokiSchemaVersion14,
+  updateToLokiSchemaVersion15,
 ];

 function updateToLokiSchemaVersion1(currentVersion, db) {
@ -1177,6 +1177,25 @@ function updateToLokiSchemaVersion14(currentVersion, db) {
  console.log(`updateToLokiSchemaVersion${targetVersion}: success!`);
 }

+function updateToLokiSchemaVersion15(currentVersion, db) {
+  const targetVersion = 15;
+  if (currentVersion >= targetVersion) {
+    return;
+  }
+  console.log(`updateToLokiSchemaVersion${targetVersion}: starting...`);
+
+  db.transaction(() => {
+    db.exec(`
+      DROP TABLE pairingAuthorisations;
+      DROP TRIGGER messages_on_delete;
+      DROP TRIGGER messages_on_update;
+    `);
+
+    writeLokiSchemaVersion(targetVersion, db);
+  })();
+  console.log(`updateToLokiSchemaVersion${targetVersion}: success!`);
+}
+
 function writeLokiSchemaVersion(newVersion, db) {
  db.prepare(
    `INSERT INTO loki_schema(
@ -1287,7 +1306,8 @@ function initialize({ configDir, key, messages, passwordAttempt }) {

    // Clear any already deleted db entries on each app start.
    vacuumDatabase(db);
-    getMessageCount();
+    const msgCount = getMessageCount();
+    console.warn('total message count: ', msgCount);
  } catch (error) {
    if (passwordAttempt) {
      throw error;
@ -1612,13 +1632,6 @@ function getAllConversations() {
  return map(rows, row => jsonToObject(row.json));
 }

-function getAllConversationIds() {
-  const rows = globalInstance
-    .prepare(`SELECT id FROM ${CONVERSATIONS_TABLE} ORDER BY id ASC;`)
-    .all();
-  return map(rows, row => row.id);
-}
-
 function getAllOpenGroupV1Conversations() {
  const rows = globalInstance
    .prepare(
@ -1992,16 +2005,6 @@ function getMessageById(id) {
  return jsonToObject(row.json);
 }

-function getAllMessages() {
-  const rows = globalInstance.prepare(`SELECT json FROM ${MESSAGES_TABLE} ORDER BY id ASC;`).all();
-  return map(rows, row => jsonToObject(row.json));
-}
-
-function getAllMessageIds() {
-  const rows = globalInstance.prepare(`SELECT id FROM ${MESSAGES_TABLE} ORDER BY id ASC;`).all();
-  return map(rows, row => row.id);
-}
-
 function getMessageBySender({ source, sourceDevice, sentAt }) {
  const rows = globalInstance
    .prepare(
--- a/better-sqlite3@7.1.4
+++ b/better-sqlite3@7.1.4
--- a/build/config.gypi
+++ b/build/config.gypi
@ -0,0 +1,83 @@
+# Do not edit. File was generated by node-gyp's "configure" step
+{
+  "target_defaults": {
+    "cflags": [],
+    "default_configuration": "Release",
+    "defines": [],
+    "include_dirs": [],
+    "libraries": []
+  },
+  "variables": {
+    "asan": 0,
+    "build_v8_with_gn": "false",
+    "coverage": "false",
+    "dcheck_always_on": 0,
+    "debug_nghttp2": "false",
+    "debug_node": "false",
+    "enable_lto": "false",
+    "enable_pgo_generate": "false",
+    "enable_pgo_use": "false",
+    "error_on_warn": "false",
+    "force_dynamic_crt": 0,
+    "gas_version": "2.30",
+    "host_arch": "x64",
+    "icu_data_in": "../../deps/icu-tmp/icudt67l.dat",
+    "icu_endianness": "l",
+    "icu_gyp_path": "tools/icu/icu-generic.gyp",
+    "icu_path": "deps/icu-small",
+    "icu_small": "false",
+    "icu_ver_major": "67",
+    "is_debug": 0,
+    "llvm_version": "0.0",
+    "napi_build_version": "7",
+    "node_byteorder": "little",
+    "node_debug_lib": "false",
+    "node_enable_d8": "false",
+    "node_install_npm": "true",
+    "node_module_version": 83,
+    "node_no_browser_globals": "false",
+    "node_prefix": "/",
+    "node_release_urlbase": "https://nodejs.org/download/release/",
+    "node_section_ordering_info": "",
+    "node_shared": "false",
+    "node_shared_brotli": "false",
+    "node_shared_cares": "false",
+    "node_shared_http_parser": "false",
+    "node_shared_libuv": "false",
+    "node_shared_nghttp2": "false",
+    "node_shared_openssl": "false",
+    "node_shared_zlib": "false",
+    "node_tag": "",
+    "node_target_type": "executable",
+    "node_use_bundled_v8": "true",
+    "node_use_dtrace": "false",
+    "node_use_etw": "false",
+    "node_use_node_code_cache": "true",
+    "node_use_node_snapshot": "true",
+    "node_use_openssl": "true",
+    "node_use_v8_platform": "true",
+    "node_with_ltcg": "false",
+    "node_without_node_options": "false",
+    "openssl_fips": "",
+    "openssl_is_fips": "false",
+    "ossfuzz": "false",
+    "shlib_suffix": "so.83",
+    "target_arch": "x64",
+    "v8_enable_31bit_smis_on_64bit_arch": 0,
+    "v8_enable_gdbjit": 0,
+    "v8_enable_i18n_support": 1,
+    "v8_enable_inspector": 1,
+    "v8_enable_lite_mode": 0,
+    "v8_enable_object_print": 1,
+    "v8_enable_pointer_compression": 0,
+    "v8_no_strict_aliasing": 1,
+    "v8_optimized_debug": 1,
+    "v8_promise_internal_field_count": 1,
+    "v8_random_seed": 0,
+    "v8_trace_maps": 0,
+    "v8_use_siphash": 1,
+    "want_separate_host_toolset": 0,
+    "nodedir": "/home/warrick/.cache/node-gyp/14.16.0",
+    "standalone_static_library": 1
+  }
+}
--- a/js/modules/crypto.js
+++ b/js/modules/crypto.js
@ -9,7 +9,6 @@ module.exports = {
  concatenateBytes,
  constantTimeEqual,
  decryptSymmetric,
-  deriveAccessKey,
  encryptAesCtr,
  encryptSymmetric,
  getRandomBytes,
@ -27,13 +26,6 @@ function bytesFromString(string) {

 // High-level Operations

-async function deriveAccessKey(profileKey) {
-  const iv = getZeroes(12);
-  const plaintext = getZeroes(16);
-  const accessKey = await _encrypt_aes_gcm(profileKey, iv, plaintext);
-  return _getFirstBytes(accessKey, 16);
-}
-
 const IV_LENGTH = 16;
 const MAC_LENGTH = 16;
 const NONCE_LENGTH = 16;
@ -141,17 +133,6 @@ async function encryptAesCtr(key, plaintext, counter) {
  return ciphertext;
 }

-async function _encrypt_aes_gcm(key, iv, plaintext) {
-  const algorithm = {
-    name: 'AES-GCM',
-    iv,
-  };
-  const extractable = false;
-
-  const cryptoKey = await crypto.subtle.importKey('raw', key, algorithm, extractable, ['encrypt']);
-  return crypto.subtle.encrypt(algorithm, cryptoKey, plaintext);
-}
-
 // Utility

 function getRandomBytes(n) {
--- a/js/modules/types/conversation.js
+++ b/js/modules/types/conversation.js
@ -1,6 +1,6 @@
 /* global crypto */

-const { isFunction, isNumber } = require('lodash');
+const { isFunction } = require('lodash');
 const { createLastMessageUpdate } = require('../../../ts/types/Conversation');
 const { arrayBufferToBase64 } = require('../crypto');

@ -55,60 +55,6 @@ function buildAvatarUpdater({ field }) {
 }

 const maybeUpdateAvatar = buildAvatarUpdater({ field: 'avatar' });
-const maybeUpdateProfileAvatar = buildAvatarUpdater({
-  field: 'profileAvatar',
-});
-
-async function upgradeToVersion2(conversation, options) {
-  if (conversation.version >= 2) {
-    return conversation;
-  }
-
-  const { writeNewAttachmentData } = options;
-  if (!isFunction(writeNewAttachmentData)) {
-    throw new Error('Conversation.upgradeToVersion2: writeNewAttachmentData must be a function');
-  }
-
-  let { avatar, profileAvatar, profileKey } = conversation;
-
-  if (avatar && avatar.data) {
-    avatar = {
-      hash: await computeHash(avatar.data),
-      path: await writeNewAttachmentData(avatar.data),
-    };
-  }
-
-  if (profileAvatar && profileAvatar.data) {
-    profileAvatar = {
-      hash: await computeHash(profileAvatar.data),
-      path: await writeNewAttachmentData(profileAvatar.data),
-    };
-  }
-
-  if (profileKey && profileKey.byteLength) {
-    profileKey = arrayBufferToBase64(profileKey);
-  }
-
-  return {
-    ...conversation,
-    version: 2,
-    avatar,
-    profileAvatar,
-    profileKey,
-  };
-}
-
-async function migrateConversation(conversation, options = {}) {
-  if (!conversation) {
-    return conversation;
-  }
-  if (!isNumber(conversation.version)) {
-    // eslint-disable-next-line no-param-reassign
-    conversation.version = 1;
-  }
-
-  return upgradeToVersion2(conversation, options);
-}

 async function deleteExternalFiles(conversation, options = {}) {
  if (!conversation) {
@ -133,9 +79,7 @@ async function deleteExternalFiles(conversation, options = {}) {

 module.exports = {
  deleteExternalFiles,
-  migrateConversation,
  maybeUpdateAvatar,
-  maybeUpdateProfileAvatar,
  createLastMessageUpdate,
  arrayBufferToBase64,
 };
--- a/js/util_worker_tasks.js
+++ b/js/util_worker_tasks.js
@ -13,6 +13,7 @@ const functions = {
  generateEphemeralKeyPair,
  decryptAttachmentBuffer,
  encryptAttachmentBuffer,
+  bytesFromString
 };

 onmessage = async e => {
--- a/libloki/test/components.js
+++ b/libloki/test/components.js
--- a/libloki/test/test.js
+++ b/libloki/test/test.js
--- a/libtextsecure/libsignal-protocol.js
+++ b/libtextsecure/libsignal-protocol.js
@ -35065,8 +35065,10 @@ var libsignal
    'use strict';

    function validatePrivKey(privKey) {
-      if (privKey === undefined || !(privKey instanceof ArrayBuffer) || privKey.byteLength != 32) {
-        throw new Error("Invalid private key");
+        if (privKey === undefined || !(privKey instanceof ArrayBuffer)) {       
+        console.log(privKey === undefined, (privKey instanceof ArrayBuffer), privKey.byteLength)
+
+        throw new Error("Invalid private key", privKey);
      }
    }
    function validatePubKeyFormat(pubKey) {
--- a/0
+++ b/0
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -2,7 +2,7 @@
  "name": "session-desktop",
  "productName": "Session",
  "description": "Private messaging from your desktop",
-  "version": "1.6.7",
+  "version": "1.6.9",
  "license": "GPL-3.0",
  "author": {
    "name": "Loki Project",
@ -17,6 +17,7 @@
    "postinstall": "electron-builder install-app-deps && rimraf node_modules/dtrace-provider",
    "start": "cross-env NODE_APP_INSTANCE=$MULTI electron .",
    "start-prod": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod$MULTI electron .",
+    "start-prod2": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod2 electron .",
    "start-swarm-test": "cross-env NODE_ENV=swarm-testing NODE_APP_INSTANCE=$MULTI electron .",
    "grunt": "grunt",
    "grunt:dev": "yarn clean-transpile; yarn grunt dev --force",
--- a/ts/components/ConversationListItem.tsx
+++ b/ts/components/ConversationListItem.tsx
@ -210,7 +210,6 @@ const AvatarItem = (props: {
 };

 const ConversationListItem = (props: Props) => {
-  // console.warn('ConversationListItem', props.id.substr(-1), ': ', props);
  const {
    activeAt,
    unreadCount,
--- a/ts/components/SearchResults.tsx
+++ b/ts/components/SearchResults.tsx
@ -54,7 +54,7 @@ export const SearchResults = (props: SearchResultsProps) => {
        <ContactsItem header={window.i18n('contactsHeader')} items={contacts} />
      ) : null}

-      {haveMessages ? (
+      {/* {haveMessages ? (
        <div className="module-search-results__messages">
          {hideMessagesHeader ? null : (
            <div className="module-search-results__messages-header">
@ -65,7 +65,7 @@ export const SearchResults = (props: SearchResultsProps) => {
            <MessageSearchResult key={message.id} {...message} />
          ))}
        </div>
-      ) : null}
+      ) : null} */}
    </div>
  );
 };
--- a/ts/components/conversation/Image.tsx
+++ b/ts/components/conversation/Image.tsx
@ -62,6 +62,7 @@ export const Image = (props: Props) => {
  const role = canClick ? 'button' : undefined;

  const { loading, urlToLoad } = useEncryptedFileFetch(url, attachment.contentType);
+
  // data will be url if loading is finished and '' if not
  const srcData = !loading ? urlToLoad : '';

--- a/ts/components/conversation/Message.tsx
+++ b/ts/components/conversation/Message.tsx
@ -164,7 +164,7 @@ class MessageInner extends React.PureComponent<Props, State> {

  public checkExpired() {
    const now = Date.now();
-    const { isExpired, expirationTimestamp, expirationLength } = this.props;
+    const { isExpired, expirationTimestamp, expirationLength, convoId, id } = this.props;

    if (!expirationTimestamp || !expirationLength) {
      return;
@ -178,17 +178,23 @@ class MessageInner extends React.PureComponent<Props, State> {
        expiring: true,
      });

-      const setExpired = () => {
+      const setExpired = async () => {
        this.setState({
          expired: true,
        });
+        await window.Signal.Data.removeMessage(id);
        window.inboxStore?.dispatch(
-          messageExpired({ messageId: this.props.id, conversationKey: this.props.convoId })
+          messageExpired({
+            conversationKey: convoId,
+            messageId: id,
+          })
        );
-        getConversationController()
-          .get(this.props.convoId)
-          ?.updateLastMessage();
+        const convo = getConversationController().get(convoId);
+        convo?.updateLastMessage();
      };
+      // as 'checkExpired' is potentially called more than once (componentDidUpdate & componentDidMount),
+      //  we need to clear the timeout call to 'setExpired' first to avoid multiple calls to 'setExpired'.
+      global.clearTimeout(this.expiredTimeout);
      this.expiredTimeout = setTimeout(setExpired, EXPIRED_DELAY);
    }
  }
--- a/ts/components/session/UserSearchDropdown.tsx
+++ b/ts/components/session/UserSearchDropdown.tsx
@ -5,6 +5,7 @@ import { SessionSearchInput } from './SessionSearchInput';

 import { SearchResultsProps } from '../SearchResults';
 import { DefaultTheme } from 'styled-components';
+import autoBind from 'auto-bind';

 export interface Props {
  searchTerm: string;
@ -18,13 +19,9 @@ interface State {
 }

 export class UserSearchDropdown extends React.Component<Props, State> {
-  private readonly updateSearchBound: (searchedString: string) => void;
-
  public constructor(props: Props) {
    super(props);
-    this.updateSearchBound = this.updateSearch.bind(this);
-    this.handleNavigation = this.handleNavigation.bind(this);
-    this.handleContactSelected = this.handleContactSelected.bind(this);
+    autoBind(this);
    this.state = {
      selectedContact: -1,
    };
@ -64,7 +61,7 @@ export class UserSearchDropdown extends React.Component<Props, State> {
      <div className="user-search-dropdown">
        <SessionSearchInput
          searchString={this.props.searchTerm}
-          onChange={this.updateSearchBound}
+          onChange={this.updateSearch}
          placeholder={placeholder}
          handleNavigation={this.handleNavigation}
        />
--- a/ts/components/session/conversation/SessionMessagesListContainer.tsx
+++ b/ts/components/session/conversation/SessionMessagesListContainer.tsx
@ -6,6 +6,7 @@ import _ from 'lodash';
 import { contextMenu } from 'react-contexify';
 import {
  fetchMessagesForConversation,
+  markConversationFullyRead,
  quotedMessageToAnimate,
  ReduxConversationType,
  setNextMessageToPlay,
@ -173,7 +174,9 @@ class SessionMessagesListContainerInner extends React.Component<Props> {
    }

    if ((forceIsOnBottom || this.getScrollOffsetBottomPx() === 0) && isElectronWindowFocused()) {
-      void conversation.markRead(messagesProps[0].propsForMessage.receivedAt || 0);
+      void conversation.markRead(Date.now()).then(() => {
+        window.inboxStore?.dispatch(markConversationFullyRead(conversationKey));
+      });
    }
  }

@ -369,7 +372,9 @@ class SessionMessagesListContainerInner extends React.Component<Props> {

    const conversation = getConversationController().get(conversationKey);
    if (isElectronWindowFocused()) {
-      void conversation.markRead(messagesProps[0].propsForMessage.receivedAt || 0);
+      void conversation.markRead(Date.now()).then(() => {
+        window.inboxStore?.dispatch(markConversationFullyRead(conversationKey));
+      });
    }
  }

--- a/ts/components/session/conversation/SessionRightPanel.tsx
+++ b/ts/components/session/conversation/SessionRightPanel.tsx
@ -122,7 +122,7 @@ const HeaderItem = () => {
    avatarPath,
    isPublic,
    id,
-    weAreAdmin,
+    isGroup,
    isKickedFromGroup,
    profileName,
    phoneNumber,
@ -131,7 +131,7 @@ const HeaderItem = () => {
    name,
  } = selectedConversation;

-  const showInviteContacts = (isPublic || weAreAdmin) && !isKickedFromGroup && !isBlocked && !left;
+  const showInviteContacts = isGroup && !isKickedFromGroup && !isBlocked && !left;
  const userName = name || profileName || phoneNumber;

  return (
@ -249,9 +249,9 @@ export const SessionRightPanelWithDetails = () => {
    };
  });

-  const showUpdateGroupNameButton = weAreAdmin && !commonNoShow;
+  const showUpdateGroupNameButton =
+    isGroup && (!isPublic || (isPublic && weAreAdmin)) && !commonNoShow;
  const showAddRemoveModeratorsButton = weAreAdmin && !commonNoShow && isPublic;
-
  const showUpdateGroupMembersButton = !isPublic && isGroup && !commonNoShow;

  const deleteConvoAction = isPublic
--- a/ts/components/session/icon/Icons.tsx
+++ b/ts/components/session/icon/Icons.tsx
@ -23,6 +23,7 @@ export enum SessionIconType {
  Lock = 'lock',
  Microphone = 'microphone',
  Moon = 'moon',
+  Oxen = 'oxen',
  Pause = 'pause',
  Pencil = 'pencil',
  Pin = 'pin',
@ -213,6 +214,12 @@ export const icons = {
    viewBox: '0.5 0.5 22 22',
    ratio: 1,
  },
+  [SessionIconType.Oxen]: {
+    path:
+      'M1033.9 1319.4h1v122h-1c-1.7-1.9-1.6-4.3-1.6-6.6v-108.7c0-2.4-.2-4.8 1.6-6.7zM773.4 1441.4c-21 0-42-.1-63 .1-4.2 0-6.9-1.4-9.2-4.6-10.2-14.5-16.9-30.2-18.5-48.2-2.3-24.5 4.9-45.8 19-65.4 1.9-2.7 4.3-4.1 7.9-4.1 42.3.1 84.6.2 127 0 4.5 0 5.8 1.4 5.5 5.7-.4 5.1-.3 10.3 0 15.5.3 4-1.1 5.1-5.1 5-22.8-.2-45.7-.1-68.5-.1-15 0-30 .1-45-.1-3.1 0-4.8 1-6 3.9-1.7 4-2.9 8.1-4.1 12.3-1.1 3.8 0 5 4 5 23.3-.1 46.7-.1 70-.1 13.3 0 26.7.1 40-.1 3.8-.1 5 1.1 4.8 4.8-.3 5.5-.3 11 0 16.5.3 4.5-1 6-5.7 5.9-33.8-.2-67.6-.1-101.5-.1-2.8 0-5.7.3-8.5-.1-3.8-.4-4.1 1.4-3.4 4.3 0 .2 0 .3.1.5 3 16.2 4.4 17.3 20.6 17.3 34.3 0 68.6.1 103-.1 4 0 5.7.9 5.4 5.2-.4 5.5-.3 11 0 16.5.2 3.6-1.2 4.5-4.6 4.5-21.6-.1-42.9 0-64.2 0zM397.2 1319.3c20 0 40 .1 60-.1 3.6 0 5.8 1.3 7.8 4.1 13.9 19.4 20.7 40.9 18.8 64.7-1.5 18.8-8.7 35.7-19.9 50.8-1.4 1.9-3.2 2.6-5.6 2.6-40.8-.1-81.6-.1-122.4 0-2.2 0-3.7-.7-5-2.5-11.5-14.8-18.2-31.4-20-50.1-2.2-21.7 3.6-41.4 14.7-59.7.2-.3.3-.6.5-.9 3.6-6.3 8-9.6 16.2-9.2 18.2.9 36.6.3 54.9.3zM1033.9 1319.4v121.9c-5.7 0-11.4-.3-17 .2-6.6.6-12-1.9-17-5.8-32.5-25.1-64.9-50.2-97.4-75.2-1.6-1.2-3.2-2.3-5.6-4.1v5.8c0 24.5-.1 49 .1 73.5 0 4.7-1.4 6-5.9 5.7-6.3-.4-12.7-.2-19 0-2.8.1-4.2-.6-4.2-3.8.1-38.2.1-76.3 0-114.5 0-3.2 1.3-3.9 4.2-3.9 6 .2 12 .1 18 .1 7.3 0 12.1 5.2 17.3 9.1 21.4 16.3 42.7 32.7 64 49.2 11.3 8.7 22.5 17.4 33.9 26.2 1.3-1.8.7-3.5.7-5.1 0-24.8.1-49.7-.1-74.5 0-3.9 1-5.3 5-5.1 7.6.5 15.3.3 23 .3zM488.8 1319.4c14.1 0 27-.1 39.9.1 4.3.1 7.9 2.6 11 5.3 12.9 11.2 25.9 22.3 38.7 33.7 2.7 2.4 4.6 1.8 6.9-.2 10.5-9.1 21.1-18.3 31.6-27.5 2.9-2.5 5.7-5.1 8.7-7.5 2.8-2.2 6.1-3.8 9.6-3.9 12.6-.2 25.2-.1 37.9-.1.1 2.1-1.4 2.8-2.5 3.7-13.3 11.5-26.7 23-40 34.5-7.9 6.8-15.8 13.7-23.8 20.5-2.5 2.1-1.5 3.5.4 5.1 10.1 8.6 20.2 17.3 30.3 26 12.2 10.5 24.4 21 37.5 32.2-14.2 0-27.4.4-40.6-.2-7.3-.3-11.7-6.5-16.9-10.9-10.8-9.1-21.4-18.5-32-27.8-2.4-2.1-4.5-2.3-7-.2-12.5 10.9-25.2 21.7-37.6 32.7-4.8 4.3-10 6.7-16.7 6.5-11.3-.3-22.7-.1-34.6-.1 4.5-5.4 9.8-9.2 14.6-13.5 13.3-11.8 26.9-23.2 40.4-34.8 3.9-3.3 7.8-6.7 11.8-9.9 2.6-2.1 2.6-3.5-.1-5.8-14-11.8-27.7-23.8-41.6-35.7-8.3-7-16.7-14.3-25.9-22.2zM153.9 1273.4c5.4 1.3 10.9 2.3 16.3 3.9 41.5 12.6 67.5 40.1 76.6 82.4 6.7 31.3-.6 60.2-19.9 85.5-18.2 23.9-42.5 37.5-72.4 41.2-27.9 3.4-53.1-3.5-75.7-19.9-24.1-17.5-37.8-41.4-42.8-70.6-.2-1-.1-2-1.1-2.6v-26c1.6-19.6 9.1-36.9 20.8-52.5 15.4-20.4 35.8-33.4 60.5-39.7 4.2-1.1 8.5-.7 12.7-1.8 8.3.1 16.6.1 25 .1zM142.8 1379.4c2.3 6 8.1 8.5 12.4 12.5 10.7 9.7 21.8 18.9 32.8 28.3 4.8 4.1 9.4 8.3 14.8 12.9H80.9c6.2-5.5 12-10.5 17.8-15.6 13.2-11.4 26.4-22.7 39.6-34.1 1.2-1.1 2.7-2.1 2.6-4 .7-.5 1.3-.5 1.9 0zM142.8 1379.4h-1.9c-12.9-11-25.7-22-38.6-33-7-6-14-12.1-21.6-18.7h122.5c-20.6 17.6-40.5 34.6-60.4 51.7zM397.2 1415.4c-14.2 0-28.3-.2-42.5.1-5.1.1-8-1.1-10.1-6.3-7.9-20.1-7.8-39.8 1-59.5 1.4-3.1 3.1-4.4 6.8-4.4 30 .2 60 .1 90 0 3.6 0 5.2 1.3 6.6 4.5 4.1 9.3 6.4 19 6.7 28.9.3 11.9-2.5 23.4-7.6 34.2-1.2 2.6-3.2 2.4-5.4 2.4-15.2.1-30.4.1-45.5.1zM153.9 1273.4c292.2 0 584.3 0 876.5-.1 3.7 0 4.7.8 4.6 4.6-.3 13.8-.1 27.7-.1 41.5-.4.4-.9.7-1.4.9-6.8 1-13.6.3-20.4.5-5.2.2-5.7.5-5.7 5.8 0 23.3 0 46.6-.1 70 0 2.7 1.2 6.5-1.8 7.7-2.5 1.1-4.6-2-6.7-3.6-31.9-24.6-64-49-95.8-73.8-6.7-5.3-13.9-6.3-22-6.1-13.3.4-11.7-1.3-11.7 11.8-.1 33.5 0 67 0 100.4 0 6.8.1 7 7 7 4.5 0 9 .1 13.5 0 5.1-.1 5.7-.6 5.7-5.8 0-23 0-46 .1-69 0-2.9-1.2-6.9 1.6-8.4 2.9-1.5 5.3 2 7.6 3.7 31.8 24.5 63.7 48.8 95.4 73.5 5.2 4 10.7 6.4 17.4 6.1 5.3-.3 10.7-.6 15.9.4.5.3 1 .6 1.4.9 0 15-.1 30 .1 45 0 2.5-.6 3.5-3.1 3-.5-.1-1 0-1.5 0-330.3 0-660.7 0-991 .1-3.7 0-4.6-.8-4.6-4.6.2-30.5.1-61 .1-91.5 3.4 1 2.6 4.3 3.1 6.6 3.1 16 9.4 30.6 19.2 43.5 18.3 24.2 42.6 38.3 72.8 41.7 30.1 3.5 56.7-4.8 79.9-24.2 21.4-17.9 33.4-40.9 36.9-68.7 6.6-53-29.2-105-84.8-115.9-2.8-.4-6.5.7-8.1-3zM128.9 1273.4c-2.8 1.6-6 1.5-9 2.2-20.6 4.6-38.6 14.1-53.5 28.9-16.7 16.7-26.7 36.9-30.5 60.2-.2 1-.1 2-1 2.6 0-30.3 0-60.5-.1-90.8 0-2.8.6-3.3 3.3-3.3 30.3.2 60.5.2 90.8.2zM107.2 0C48 0 0 48 0 107.2s48 107.2 107.2 107.2 107.2-48 107.2-107.2S166.4 0 107.2 0zM45.3 160.3l61.7-53.4 61.7 53.4H45.3zm61.7-53.5L45.3 53.4h123.4L107 106.8zM426.9 46H297.7s-22.6 25.2-22.4 60.9c.2 35.7 22.4 60.9 22.4 60.9h129s21.7-25.8 22.4-60.4C449.7 73 426.9 46 426.9 46zm-6 61.4c-.4 19.9-9.1 34.9-9.1 34.9h-99.3s-8.8-14.6-8.9-35.2c-.1-20.6 8.9-35.2 8.9-35.2h99.4s9.3 15.5 9 35.5zM454.3 46l70.6 60.9-70.6 60.9h38.4s6.7-.1 12.8-5.6c6.1-5.5 41.5-35.9 41.5-35.9l45.5 39.1s3 2.3 9.8 2.5 37.7 0 37.7 0L569.4 107 640 46h-38.3s-5.2-.9-12.7 5.5c-7.5 6.4-41.8 36.3-41.8 36.3l-44.7-38s-2.7-3.8-12.2-3.8c-9.5-.1-36 0-36 0zM806.8 71.9V46h-137s-22.6 25.2-22.4 60.9 22.4 60.9 22.4 60.9h137v-25.6H684.6s-5.4-8.9-7.8-22.6h120V92.9H677c2.5-12.8 7.6-21.1 7.6-21.1h122.2zM833.1 167.9V46h20.4s5.9-.2 10.7 3.4c4.7 3.6 107.4 82.5 107.4 82.5V46h28.3v121.8h-21.6s-5.6.4-10.3-3.4c-4.7-3.7-106.5-82-106.5-82v85.4l-28.4.1z',
+    viewBox: '0 0 1000 214.3',
+    ratio: 4,
+  },
  [SessionIconType.Pause]: {
    path:
      'M33,4.5v24c0,2.484-2.016,4.5-4.5,4.5h-24C2.016,33,0,30.984,0,28.5v-24C0,2.016,2.016,0,4.5,0h24 C30.984,0,33,2.016,33,4.5z',
--- a/ts/components/session/settings/SessionSettings.tsx
+++ b/ts/components/session/settings/SessionSettings.tsx
@ -22,6 +22,7 @@ import { unblockConvoById } from '../../../interactions/conversationInteractions
 import { toggleAudioAutoplay } from '../../../state/ducks/userConfig';
 import { sessionPassword } from '../../../state/ducks/modalDialog';
 import { PasswordAction } from '../SessionPasswordModal';
+import { SessionIconButton, SessionIconSize, SessionIconType } from '../icon';

 export enum SessionSettingCategory {
  Appearance = 'appearance',
@ -246,9 +247,17 @@ class SettingsViewInner extends React.Component<SettingsViewProps, State> {
  }

  public renderSessionInfo(): JSX.Element {
+    const openOxenWebsite = () => {
+      void shell.openExternal('https://oxen.io/');
+    };
    return (
      <div className="session-settings__version-info">
        <span className="text-selectable">v{window.versionInfo.version}</span>
+        <span><SessionIconButton
+          iconSize={SessionIconSize.Medium}
+          iconType={SessionIconType.Oxen}
+          onClick={openOxenWebsite}
+        /></span>
        <span className="text-selectable">{window.versionInfo.commitHash}</span>
      </div>
    );
--- a/ts/data/data.ts
+++ b/ts/data/data.ts
@ -89,7 +89,6 @@ const channelsToMake = {
  removeConversation,

  getAllConversations,
-  getAllConversationIds,
  getAllOpenGroupV1Conversations,
  getPubkeysInPublicConversation,
  getAllGroupsInvolvingId,
@ -116,8 +115,6 @@ const channelsToMake = {
  getMessageBySenderAndServerTimestamp,
  getMessageIdsFromServerIds,
  getMessageById,
-  getAllMessages,
-  getAllMessageIds,
  getMessagesBySentAt,
  getExpiredMessages,
  getOutgoingWithoutExpiresAt,
@ -541,11 +538,6 @@ export async function getAllConversations(): Promise<ConversationCollection> {
  return collection;
 }

-export async function getAllConversationIds(): Promise<Array<string>> {
-  const ids = await channels.getAllConversationIds();
-  return ids;
-}
-
 export async function getAllOpenGroupV1Conversations(): Promise<ConversationCollection> {
  const conversations = await channels.getAllOpenGroupV1Conversations();

@ -633,7 +625,7 @@ export async function saveMessages(arrayOfMessages: Array<MessageAttributes>): P
 }

 export async function removeMessage(id: string): Promise<void> {
-  const message = await getMessageById(id);
+  const message = await getMessageById(id, true);

  // Note: It's important to have a fully database-hydrated model to delete here because
  //   it needs to delete all associated on-disk files along with the database delete.
@ -655,26 +647,21 @@ export async function getMessageIdsFromServerIds(
  return channels.getMessageIdsFromServerIds(serverIds, conversationId);
 }

-export async function getMessageById(id: string): Promise<MessageModel | null> {
+export async function getMessageById(
+  id: string,
+  skipTimerInit: boolean = false
+): Promise<MessageModel | null> {
  const message = await channels.getMessageById(id);
  if (!message) {
    return null;
  }
+  if (skipTimerInit) {
+    message.skipTimerInit = skipTimerInit;
+  }

  return new MessageModel(message);
 }

-// For testing only
-export async function getAllMessages(): Promise<MessageCollection> {
-  const messages = await channels.getAllMessages();
-  return new MessageCollection(messages);
-}
-
-export async function getAllMessageIds(): Promise<Array<string>> {
-  const ids = await channels.getAllMessageIds();
-  return ids;
-}
-
 export async function getMessageBySender({
  source,
  sourceDevice,
@ -744,13 +731,18 @@ export async function getUnreadCountByConversation(conversationId: string): Prom

 export async function getMessagesByConversation(
  conversationId: string,
-  { limit = 100, receivedAt = Number.MAX_VALUE, type = '%' }
+  { limit = 100, receivedAt = Number.MAX_VALUE, type = '%', skipTimerInit = false }
 ): Promise<MessageCollection> {
  const messages = await channels.getMessagesByConversation(conversationId, {
    limit,
    receivedAt,
    type,
  });
+  if (skipTimerInit) {
+    for (const message of messages) {
+      message.skipTimerInit = skipTimerInit;
+    }
+  }
  return new MessageCollection(messages);
 }

@ -775,9 +767,8 @@ export async function removeAllMessagesInConversation(conversationId: string): P
    //   time so we don't use too much memory.
    // eslint-disable-next-line no-await-in-loop
    messages = await getMessagesByConversation(conversationId, {
-      limit: 100,
+      limit: 500,
    });
-
    if (!messages.length) {
      return;
    }
@ -787,6 +778,7 @@ export async function removeAllMessagesInConversation(conversationId: string): P
    // 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
+
    await Promise.all(messages.map(message => message.cleanup()));

    // eslint-disable-next-line no-await-in-loop
--- a/ts/hooks/useEncryptedFileFetch.ts
+++ b/ts/hooks/useEncryptedFileFetch.ts
@ -19,12 +19,13 @@ export const useEncryptedFileFetch = (url: string, contentType: string) => {
  }

  useEffect(() => {
+    setLoading(true);
+    mountedRef.current = true;
    void fetchUrl();

    return () => {
      mountedRef.current = false;
    };
  }, [url]);
-
  return { urlToLoad, loading };
 };
--- a/ts/interactions/conversationInteractions.ts
+++ b/ts/interactions/conversationInteractions.ts
@ -41,7 +41,7 @@ import {
 import { getDecryptedMediaUrl } from '../session/crypto/DecryptedAttachmentsManager';
 import { IMAGE_JPEG } from '../types/MIME';
 import { FSv2 } from '../fileserver';
-import { fromBase64ToArray, toHex } from '../session/utils/String';
+import { fromBase64ToArray, fromHexToArray, toHex } from '../session/utils/String';
 import { SessionButtonColor } from '../components/session/SessionButton';
 import { perfEnd, perfStart } from '../session/utils/Performance';
 import { ReplyingToMessageProps } from '../components/session/conversation/SessionCompositionBox';
@ -350,17 +350,21 @@ export async function uploadOurAvatar(newAvatarDecrypted?: ArrayBuffer) {
    return;
  }

-  let profileKey;
+  let profileKey: Uint8Array | null;
  let decryptedAvatarData;
  if (newAvatarDecrypted) {
    // Encrypt with a new key every time
-    profileKey = window.libsignal.crypto.getRandomBytes(32);
+    profileKey = window.libsignal.crypto.getRandomBytes(32) as Uint8Array;
    decryptedAvatarData = newAvatarDecrypted;
  } else {
    // this is a reupload. no need to generate a new profileKey
-    profileKey = window.textsecure.storage.get('profileKey');
+    const ourConvoProfileKey =
+      getConversationController()
+        .get(UserUtils.getOurPubKeyStrFromCache())
+        ?.get('profileKey') || null;
+    profileKey = ourConvoProfileKey ? fromHexToArray(ourConvoProfileKey) : null;
    if (!profileKey) {
-      window.log.info('our profileKey not found');
+      window.log.info('our profileKey not found. Not reuploading our avatar');
      return;
    }
    const currentAttachmentPath = ourConvo.getAvatarPath();
@ -412,7 +416,6 @@ export async function uploadOurAvatar(newAvatarDecrypted?: ArrayBuffer) {
  const displayName = ourConvo.get('profileName');

  // write the profileKey even if it did not change
-  window.storage.put('profileKey', profileKey);
  ourConvo.set({ profileKey: toHex(profileKey) });
  // Replace our temporary image with the attachment pointer from the server:
  // this commits already
@ -439,7 +442,9 @@ export async function deleteMessagesById(
  askUserForConfirmation: boolean
 ) {
  const conversationModel = getConversationController().getOrThrow(conversationId);
-  const selectedMessages = _.compact(await Promise.all(messageIds.map(getMessageById)));
+  const selectedMessages = _.compact(
+    await Promise.all(messageIds.map(m => getMessageById(m, false)))
+  );

  const moreThanOne = selectedMessages.length > 1;

--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@ -20,7 +20,7 @@ import {
  saveMessages,
  updateConversation,
 } from '../../ts/data/data';
-import { fromArrayBufferToBase64, fromBase64ToArrayBuffer } from '../session/utils/String';
+import { fromArrayBufferToBase64, fromBase64ToArrayBuffer, toHex } from '../session/utils/String';
 import {
  actions as conversationActions,
  conversationChanged,
@ -91,8 +91,10 @@ export interface ConversationAttributes {
  nickname?: string;
  profile?: any;
  profileAvatar?: any;
+  /**
+   * Consider this being a hex string if it set
+   */
  profileKey?: string;
-  accessKey?: any;
  triggerNotificationsFor: ConversationNotificationSettingType;
  isTrustedForAttachmentDownload: boolean;
  isPinned: boolean;
@ -129,8 +131,10 @@ export interface ConversationAttributesOptionals {
  nickname?: string;
  profile?: any;
  profileAvatar?: any;
+  /**
+   * Consider this being a hex string if it set
+   */
  profileKey?: string;
-  accessKey?: any;
  triggerNotificationsFor?: ConversationNotificationSettingType;
  isTrustedForAttachmentDownload?: boolean;
  isPinned: boolean;
@ -198,7 +202,10 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
    });
    this.throttledNotify = _.debounce(this.notify, 500, { maxWait: 1000, trailing: true });
    //start right away the function is called, and wait 1sec before calling it again
-    const markReadDebounced = _.debounce(this.markReadBouncy, 1000, { leading: true });
+    const markReadDebounced = _.debounce(this.markReadBouncy, 1000, {
+      leading: true,
+      trailing: true,
+    });
    // tslint:disable-next-line: no-async-without-await
    this.markRead = async (newestUnreadDate: number) => {
      const lastReadTimestamp = this.lastReadTimestamp;
@ -782,6 +789,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
    }
    const messages = await getMessagesByConversation(this.id, {
      limit: 1,
+      skipTimerInit: true,
    });
    const lastMessageModel = messages.at(0);
    const lastMessageJSON = lastMessageModel ? lastMessageModel.toJSON() : null;
@ -972,7 +980,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
    let allUnreadMessagesInConvo = (await this.getUnread()).models;

    const oldUnreadNowRead = allUnreadMessagesInConvo.filter(
-      (message: any) => message.get('received_at') <= newestUnreadDate
+      message => (message.get('received_at') as number) <= newestUnreadDate
    );

    let read = [];
@ -1110,7 +1118,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
  }

  public isAdmin(pubKey?: string) {
-    if (!this.isPublic()) {
+    if (!this.isPublic() && !this.isGroup()) {
      return false;
    }
    if (!pubKey) {
@ -1192,36 +1200,28 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
      await this.commit();
    }
  }
-  public async setProfileKey(profileKey: string) {
-    // profileKey is a string so we can compare it directly
-    if (this.get('profileKey') !== profileKey) {
-      this.set({
-        profileKey,
-        accessKey: null,
-      });
-
-      await this.deriveAccessKeyIfNeeded();
-
-      await this.commit();
-    }
-  }
+  /**
+   * profileKey MUST be a hex string
+   * @param profileKey MUST be a hex string
+   */
+  public async setProfileKey(profileKey?: Uint8Array, autoCommit = true) {
+    const re = /[0-9A-Fa-f]*/g;

-  public async deriveAccessKeyIfNeeded() {
-    const profileKey = this.get('profileKey');
    if (!profileKey) {
      return;
    }
-    if (this.get('accessKey')) {
-      return;
-    }

-    try {
-      const profileKeyBuffer = fromBase64ToArrayBuffer(profileKey);
-      const accessKeyBuffer = await window.Signal.Crypto.deriveAccessKey(profileKeyBuffer);
-      const accessKey = fromArrayBufferToBase64(accessKeyBuffer);
-      this.set({ accessKey });
-    } catch (e) {
-      window?.log?.warn(`Failed to derive access key for ${this.id}`);
+    const profileKeyHex = toHex(profileKey);
+
+    // profileKey is a string so we can compare it directly
+    if (this.get('profileKey') !== profileKeyHex) {
+      this.set({
+        profileKey: profileKeyHex,
+      });
+
+      if (autoCommit) {
+        await this.commit();
+      }
    }
  }

--- a/ts/models/message.ts
+++ b/ts/models/message.ts
@ -57,7 +57,7 @@ import { perfEnd, perfStart } from '../session/utils/Performance';
 import { AttachmentTypeWithPath } from '../types/Attachment';

 export class MessageModel extends Backbone.Model<MessageAttributes> {
-  constructor(attributes: MessageAttributesOptionals) {
+  constructor(attributes: MessageAttributesOptionals & { skipTimerInit?: boolean }) {
    const filledAttrs = fillMessageAttributesWithDefaults(attributes);
    super(filledAttrs);

@ -76,7 +76,9 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
    }

    // this.on('expired', this.onExpired);
-    void this.setToExpire();
+    if (!attributes.skipTimerInit) {
+      void this.setToExpire();
+    }
    autoBind(this);

    this.dispatchMessageUpdate = _.throttle(this.dispatchMessageUpdate, 300);
--- a/ts/opengroup/opengroupV2/ApiUtil.ts
+++ b/ts/opengroup/opengroupV2/ApiUtil.ts
@ -41,6 +41,36 @@ export type OpenGroupV2InfoJoinable = OpenGroupV2Info & {
  base64Data?: string;
 };

+export const TextToBase64 = async (text: string) => {
+  const arrayBuffer = (await window.callWorker(
+    'bytesFromString',
+    text
+  ))
+
+  const base64 = ( await window.callWorker(
+    'arrayBufferToStringBase64',
+    arrayBuffer
+  ))
+
+  return base64;
+}
+
+export const textToArrayBuffer = async (text: string) => {
+  return (await window.callWorker(
+    'bytesFromString',
+    text
+  ))
+}
+
+export const verifyED25519Signature = async (pubkey: string, base64EncodedData: string, base64EncondedSignature: string): Promise<Boolean> => {
+  return (await window.callWorker(
+    'verifySignature',
+    pubkey,
+    base64EncodedData,
+    base64EncondedSignature
+  ));
+}
+
 export const parseMessages = async (
  rawMessages: Array<Record<string, any>>
 ): Promise<Array<OpenGroupMessageV2>> => {
--- a/ts/opengroup/opengroupV2/OpenGroupMessageV2.ts
+++ b/ts/opengroup/opengroupV2/OpenGroupMessageV2.ts
@ -67,10 +67,11 @@ export class OpenGroupMessageV2 {
    if (!signature || signature.length === 0) {
      throw new Error("Couldn't sign message");
    }
+    let base64Sig = await window.callWorker('arrayBufferToStringBase64', signature);
    return new OpenGroupMessageV2({
      base64EncodedData: this.base64EncodedData,
      sentTimestamp: this.sentTimestamp,
-      base64EncodedSignature: await window.callWorker('arrayBufferToStringBase64', signature),
+      base64EncodedSignature: base64Sig,
      sender: this.sender,
      serverId: this.serverId,
    });
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@ -34,11 +34,6 @@ async function handleOurProfileUpdate(
      return;
    }

-    if (profileKey?.length) {
-      window?.log?.info('Saving our profileKey from configuration message');
-      // TODO not sure why we keep our profileKey in storage AND in our conversaio
-      window.textsecure.storage.put('profileKey', profileKey);
-    }
    const lokiProfile = {
      displayName,
      profilePicture,
--- a/ts/receiver/dataMessage.ts
+++ b/ts/receiver/dataMessage.ts
@ -20,11 +20,12 @@ import {
 } from '../../ts/data/data';
 import { ConversationModel, ConversationTypeEnum } from '../models/conversation';
 import { allowOnlyOneAtATime } from '../session/utils/Promise';
+import { toHex } from '../session/utils/String';

 export async function updateProfileOneAtATime(
  conversation: ConversationModel,
  profile: SignalService.DataMessage.ILokiProfile,
-  profileKey: any
+  profileKey?: Uint8Array | null // was any
 ) {
  if (!conversation?.id) {
    window?.log?.warn('Cannot update profile with empty convoid');
@ -39,7 +40,7 @@ export async function updateProfileOneAtATime(
 async function updateProfile(
  conversation: ConversationModel,
  profile: SignalService.DataMessage.ILokiProfile,
-  profileKey: any
+  profileKey?: Uint8Array | null // was any
 ) {
  const { dcodeIO, textsecure, Signal } = window;

@ -48,7 +49,7 @@ async function updateProfile(

  newProfile.displayName = profile.displayName;

-  if (profile.profilePicture) {
+  if (profile.profilePicture && profileKey) {
    const prevPointer = conversation.get('avatarPointer');
    const needsUpdate = !prevPointer || !_.isEqual(prevPointer, profile.profilePicture);

@ -79,7 +80,7 @@ async function updateProfile(
            });
            // Only update the convo if the download and decrypt is a success
            conversation.set('avatarPointer', profile.profilePicture);
-            conversation.set('profileKey', profileKey);
+            conversation.set('profileKey', toHex(profileKey));
            ({ path } = upgraded);
          } catch (e) {
            window?.log?.error(`Could not decrypt profile image: ${e}`);
@ -91,7 +92,7 @@ async function updateProfile(
        return;
      }
    }
-  } else {
+  } else if (profileKey) {
    newProfile.avatar = null;
  }

@ -422,18 +423,15 @@ export const isDuplicate = (
 async function handleProfileUpdate(
  profileKeyBuffer: Uint8Array,
  convoId: string,
-  convoType: ConversationTypeEnum,
  isIncoming: boolean
 ) {
-  const profileKey = StringUtils.decode(profileKeyBuffer, 'base64');
-
  if (!isIncoming) {
    // We update our own profileKey if it's different from what we have
    const ourNumber = UserUtils.getOurPubKeyStrFromCache();
    const me = getConversationController().getOrCreate(ourNumber, ConversationTypeEnum.PRIVATE);

    // Will do the save for us if needed
-    await me.setProfileKey(profileKey);
+    await me.setProfileKey(profileKeyBuffer);
  } else {
    const sender = await getConversationController().getOrCreateAndWait(
      convoId,
@ -441,7 +439,7 @@ async function handleProfileUpdate(
    );

    // Will do the save for us
-    await sender.setProfileKey(profileKey);
+    await sender.setProfileKey(profileKeyBuffer);
  }
 }

@ -582,7 +580,7 @@ export async function handleMessageEvent(event: MessageEvent): Promise<void> {
    return;
  }
  if (message.profileKey?.length) {
-    await handleProfileUpdate(message.profileKey, conversationId, type, isIncoming);
+    await handleProfileUpdate(message.profileKey, conversationId, isIncoming);
  }

  const msg = createMessage(data, isIncoming);
--- a/ts/receiver/queuedJob.ts
+++ b/ts/receiver/queuedJob.ts
@ -204,16 +204,14 @@ function handleLinkPreviews(messageBody: string, messagePreview: any, message: M
 }

 async function processProfileKey(
-  source: string,
  conversation: ConversationModel,
  sendingDeviceConversation: ConversationModel,
-  profileKeyBuffer: Uint8Array
+  profileKeyBuffer?: Uint8Array
 ) {
-  const profileKey = StringUtils.decode(profileKeyBuffer, 'base64');
  if (conversation.isPrivate()) {
-    await conversation.setProfileKey(profileKey);
+    await conversation.setProfileKey(profileKeyBuffer);
  } else {
-    await sendingDeviceConversation.setProfileKey(profileKey);
+    await sendingDeviceConversation.setProfileKey(profileKeyBuffer);
  }
 }

@ -360,12 +358,7 @@ async function handleRegularMessage(
  }

  if (dataMessage.profileKey) {
-    await processProfileKey(
-      source,
-      conversation,
-      sendingDeviceConversation,
-      dataMessage.profileKey
-    );
+    await processProfileKey(conversation, sendingDeviceConversation, dataMessage.profileKey);
  }

  // we just received a message from that user so we reset the typing indicator for this convo
--- a/ts/receiver/receiver.ts
+++ b/ts/receiver/receiver.ts
@ -273,42 +273,6 @@ async function handleDecryptedEnvelope(envelope: EnvelopePlus, plaintext: ArrayB
  }
 }

-/**
- * Only used for opengroupv1 it seems.
- * To be removed soon
- */
-export async function handlePublicMessage(messageData: any) {
-  const { source } = messageData;
-  const { group, profile, profileKey } = messageData.message;
-
-  const isMe = UserUtils.isUsFromCache(source);
-
-  if (!isMe && profile) {
-    const conversation = await getConversationController().getOrCreateAndWait(
-      source,
-      ConversationTypeEnum.PRIVATE
-    );
-    await updateProfileOneAtATime(conversation, profile, profileKey);
-  }
-
-  const isPublicVisibleMessage = group && group.id && !!group.id.match(openGroupPrefixRegex);
-
-  if (!isPublicVisibleMessage) {
-    throw new Error('handlePublicMessage Should only be called with public message groups');
-  }
-
-  const ev = {
-    // Public chat messages from ourselves should be outgoing
-    type: isMe ? 'sent' : 'message',
-    data: messageData,
-    confirm: () => {
-      /* do nothing */
-    },
-  };
-
-  await handleMessageEvent(ev); // open groups v1
-}
-
 export async function handleOpenGroupV2Message(
  message: OpenGroupMessageV2,
  roomInfos: OpenGroupRequestCommonType
--- a/ts/session/snode_api/lokiRpc.ts
+++ b/ts/session/snode_api/lokiRpc.ts
@ -17,7 +17,8 @@ async function lokiFetch(
  url: string,
  options: FetchOptions,
  targetNode?: Snode,
-  associatedWith?: string
+  associatedWith?: string,
+  test?: string
 ): Promise<undefined | SnodeResponse> {
  const timeout = 10000;
  const method = options.method || 'GET';
@ -32,7 +33,7 @@ async function lokiFetch(
    // Absence of targetNode indicates that we want a direct connection
    // (e.g. to connect to a seed node for the first time)
    if (window.lokiFeatureFlags.useOnionRequests && targetNode) {
-      const fetchResult = await lokiOnionFetch(targetNode, fetchOptions.body, associatedWith);
+      const fetchResult = await lokiOnionFetch(targetNode, fetchOptions.body, associatedWith, test);
      if (!fetchResult) {
        return undefined;
      }
@ -109,5 +110,5 @@ export async function snodeRpc(
    },
  };

-  return lokiFetch(url, fetchOptions, targetNode, associatedWith);
+  return lokiFetch(url, fetchOptions, targetNode, associatedWith, method);
 }
--- a/ts/session/snode_api/onions.ts
+++ b/ts/session/snode_api/onions.ts
@ -386,7 +386,7 @@ const debug = false;
 /**
 * Only exported for testing purpose
 */
-export async function decodeOnionResult(symmetricKey: ArrayBuffer, ciphertext: string) {
+export async function decodeOnionResult(symmetricKey: ArrayBuffer, ciphertext: string, test?: string) {
  let parsedCiphertext = ciphertext;
  try {
    const jsonRes = JSON.parse(ciphertext);
@ -416,6 +416,7 @@ export async function processOnionResponse({
  abortSignal,
  associatedWith,
  lsrpcEd25519Key,
+  test
 }: {
  response?: { text: () => Promise<string>; status: number };
  symmetricKey?: ArrayBuffer;
@ -423,6 +424,7 @@ export async function processOnionResponse({
  lsrpcEd25519Key?: string;
  abortSignal?: AbortSignal;
  associatedWith?: string;
+  test?: string;
 }): Promise<SnodeResponse> {
  let ciphertext = '';

@ -453,7 +455,7 @@ export async function processOnionResponse({
  let ciphertextBuffer;

  try {
-    const decoded = await exports.decodeOnionResult(symmetricKey, ciphertext);
+    const decoded = await exports.decodeOnionResult(symmetricKey, ciphertext, test);

    plaintext = decoded.plaintext;
    ciphertextBuffer = decoded.ciphertextBuffer;
@ -658,6 +660,7 @@ const sendOnionRequestHandlingSnodeEject = async ({
  abortSignal,
  associatedWith,
  finalRelayOptions,
+  test
 }: {
  nodePath: Array<Snode>;
  destX25519Any: string;
@ -669,6 +672,7 @@ const sendOnionRequestHandlingSnodeEject = async ({
  finalRelayOptions?: FinalRelayOptions;
  abortSignal?: AbortSignal;
  associatedWith?: string;
+  test?: string;
 }): Promise<SnodeResponse> => {
  // this sendOnionRequest() call has to be the only one like this.
  // If you need to call it, call it through sendOnionRequestHandlingSnodeEject because this is the one handling path rebuilding and known errors
@ -682,6 +686,7 @@ const sendOnionRequestHandlingSnodeEject = async ({
      finalDestOptions,
      finalRelayOptions,
      abortSignal,
+      test
    });

    response = result.response;
@ -698,6 +703,7 @@ const sendOnionRequestHandlingSnodeEject = async ({
    lsrpcEd25519Key: finalDestOptions?.destination_ed25519_hex,
    abortSignal,
    associatedWith,
+    test
  });

  return processed;
@ -720,6 +726,7 @@ const sendOnionRequest = async ({
  finalDestOptions,
  finalRelayOptions,
  abortSignal,
+  test
 }: {
  nodePath: Array<Snode>;
  destX25519Any: string;
@ -730,6 +737,7 @@ const sendOnionRequest = async ({
  };
  finalRelayOptions?: FinalRelayOptions;
  abortSignal?: AbortSignal;
+  test?: string;
 }) => {
  // get destination pubkey in array buffer format
  let destX25519hex = destX25519Any;
@ -816,6 +824,7 @@ const sendOnionRequest = async ({
  // no logs for that one insecureNodeFetch as we do need to call insecureNodeFetch to our guardNode
  // window?.log?.info('insecureNodeFetch => plaintext for sendOnionRequest');

+  
  const response = await insecureNodeFetch(guardUrl, guardFetchOptions);
  return { response, decodingSymmetricKey: destCtx.symmetricKey };
 };
@ -824,7 +833,8 @@ async function sendOnionRequestSnodeDest(
  onionPath: Array<Snode>,
  targetNode: Snode,
  plaintext?: string,
-  associatedWith?: string
+  associatedWith?: string,
+  test?: string
 ) {
  return sendOnionRequestHandlingSnodeEject({
    nodePath: onionPath,
@ -834,6 +844,7 @@ async function sendOnionRequestSnodeDest(
      body: plaintext,
    },
    associatedWith,
+    test
  });
 }

@ -864,11 +875,12 @@ export function getPathString(pathObjArr: Array<{ ip: string; port: number }>):
 async function onionFetchRetryable(
  targetNode: Snode,
  body?: string,
-  associatedWith?: string
+  associatedWith?: string,
+  test?: string
 ): Promise<SnodeResponse> {
  // Get a path excluding `targetNode`:
  const path = await OnionPaths.getOnionPath(targetNode);
-  const result = await sendOnionRequestSnodeDest(path, targetNode, body, associatedWith);
+  const result = await sendOnionRequestSnodeDest(path, targetNode, body, associatedWith, test);
  return result;
 }

@ -878,12 +890,13 @@ async function onionFetchRetryable(
 export async function lokiOnionFetch(
  targetNode: Snode,
  body?: string,
-  associatedWith?: string
+  associatedWith?: string,
+  test?: string
 ): Promise<SnodeResponse | undefined> {
  try {
    const retriedResult = await pRetry(
      async () => {
-        return onionFetchRetryable(targetNode, body, associatedWith);
+        return onionFetchRetryable(targetNode, body, associatedWith, test);
      },
      {
        retries: 4,
--- a/ts/session/utils/User.ts
+++ b/ts/session/utils/User.ts
@ -3,7 +3,7 @@ import { UserUtils } from '.';
 import { getItemById } from '../../../ts/data/data';
 import { KeyPair } from '../../../libtextsecure/libsignal-protocol';
 import { PubKey } from '../types';
-import { toHex } from './String';
+import { fromHexToArray, toHex } from './String';
 import { getConversationController } from '../conversations';

 export type HexKeyPair = {
@ -97,14 +97,15 @@ export function getOurProfile(): OurLokiProfile | undefined {
    // in their primary device's conversation
    const ourNumber = window.storage.get('primaryDevicePubKey');
    const ourConversation = getConversationController().get(ourNumber);
-    const profileKey = new Uint8Array(window.storage.get('profileKey'));
+    const ourProfileKeyHex = ourConversation.get('profileKey');
+    const profileKeyAsBytes = ourProfileKeyHex ? fromHexToArray(ourProfileKeyHex) : null;

    const avatarPointer = ourConversation.get('avatarPointer');
    const { displayName } = ourConversation.getLokiProfile();
    return {
      displayName,
      avatarPointer,
-      profileKey: profileKey.length ? profileKey : null,
+      profileKey: profileKeyAsBytes?.length ? profileKeyAsBytes : null,
    };
  } catch (e) {
    window?.log?.error(`Failed to get our profile: ${e}`);
--- a/ts/session/utils/syncUtils.ts
+++ b/ts/session/utils/syncUtils.ts
@ -15,7 +15,7 @@ import {
  ConfigurationMessageContact,
 } from '../messages/outgoing/controlMessage/ConfigurationMessage';
 import { ConversationModel } from '../../models/conversation';
-import { fromBase64ToArray, fromHexToArray, fromUInt8ArrayToBase64, toHex } from './String';
+import { fromArrayBufferToBase64, fromBase64ToArray, fromBase64ToArrayBuffer, fromHex, fromHexToArray, fromUInt8ArrayToBase64, stringToArrayBuffer, stringToUint8Array, toHex } from './String';
 import { SignalService } from '../../protobuf';
 import _ from 'lodash';
 import {
@ -28,13 +28,16 @@ import { ExpirationTimerUpdateMessage } from '../messages/outgoing/controlMessag
 import { getV2OpenGroupRoom } from '../../data/opengroups';
 import { getCompleteUrlFromRoom } from '../../opengroup/utils/OpenGroupUtils';
 import { DURATION } from '../constants';
-import { SnodePool } from '../snode_api';
 import { snodeHttpsAgent } from '../snode_api/onions';

 import { default as insecureNodeFetch } from 'node-fetch';
 import { getSodium } from '../crypto';
-import { encryptUsingSessionProtocol } from '../crypto/MessageEncrypter';
 import { snodeRpc } from '../snode_api/lokiRpc';
+import { getSwarmFor, getSwarmFromCacheOrDb } from '../snode_api/snodePool';
+import { crypto_sign, to_base64, to_hex } from 'libsodium-wrappers';
+import { textToArrayBuffer, TextToBase64, verifyED25519Signature } from '../../opengroup/opengroupV2/ApiUtil';
+import { KeyPair } from '../../../libtextsecure/libsignal-protocol';
+import { getIdentityKeyPair } from './User';

 const ITEM_ID_LAST_SYNC_TIMESTAMP = 'lastSyncedTimestamp';

@ -87,7 +90,6 @@ export const forceSyncConfigurationNowIfNeeded = async (waitForMessageSent = fal
            resolve(true);
          }
          : undefined;
-        debugger;
        void getMessageQueue().sendSyncMessage(configMessage, 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.
@ -115,84 +117,60 @@ export const getNetworkTime = async (snode: Snode): Promise<string | number> =>
    let body = JSON.parse(response.body);
    let timestamp = body['timestamp'];

-    debugger;
    return timestamp ? timestamp : -1;
  }
  catch (e) {
-    debugger;
    return -1;
  }

 }

 export const forceNetworkDeletion = async () => {
-
-  // get keypair
+  let sodium = await getSodium();
  let userPubKey = await UserUtils.getOurPubKeyFromCache();

-  // get ed255 key
-  let userED25519Keypair = await UserUtils.getUserED25519KeyPair();
-  if (userED25519Keypair === undefined || userED25519Keypair.privKey === undefined) {
-    return;
-  }
+  let edKey = await UserUtils.getUserED25519KeyPair();
+  let edKeyPriv = edKey?.privKey || '';

-  // get random snode
-  let snode: Snode | undefined = await SnodePool.getRandomSnode();
+  console.log({ edKey });
+  console.log({ edKeyPriv });

+  let snode: Snode | undefined = _.shuffle((await getSwarmFor(userPubKey.key)))[0]
  let timestamp = await getNetworkTime(snode);

-  let sodium = await getSodium();
+  let text = `delete_all${timestamp.toString()}`;

-  // create data by combining shit. Combines the method + timestamp to a byteArray in android
-  let verificationData = 'delete_all' + timestamp.toString();
+  let toSign = StringUtils.encode(text, 'utf8');
+  console.log({ toSign });

-  // convert vert data to byteArray for signing
+  let toSignBytes = new Uint8Array(toSign);
+  console.log({ toSignBytes });

-  // sign the data with sodium + user ed255key in byte for (userED25519Keypair.bytes)
-  let userED25519SecretBytes = fromHexToArray(userED25519Keypair.privKey)
+  let edKeyBytes = fromHexToArray(edKeyPriv)

-  let signature = sodium.crypto_sign_detached(verificationData, userED25519SecretBytes)
+  // using uint or string for message input makes no difference here.
+  // let sig = sodium.crypto_sign_detached(toSignBytes, edKeyBytes);
+  let sig = sodium.crypto_sign_detached(toSignBytes, edKeyBytes);
+  const sig64 = fromUInt8ArrayToBase64(sig);
+  console.log({ sig });
+  console.log({ sig64: sig64 });
+  console.log({ sigLength: sig64.length });
+
+  // pubkey - hex - from xSK.public_key
+  // timestamp - ms
+  // signature - ? Base64.encodeBytes(signature)

-  // package into some params
  let deleteMessageParams = {
-    pubkey: userPubKey.key, // not cast as anything in android example
-    pubkeyED25519: toHex(StringUtils.encode(userED25519Keypair.pubKey, 'base64')) , // not sure if this is a proper hex value?
-    // pubkeyED25519: userED25519Keypair.pubKey,
-    timestamp, // -1 atm..
-    signature: fromUInt8ArrayToBase64(signature)
+    pubkey: userPubKey.key, // pubkey is doing alright
+    pubkeyED25519: edKey?.pubKey, // ed pubkey is right
+    timestamp,
+    signature: sig64
  }

-  // send method to the network.
-  // await send('delete_all', snode, userPubKey.key, deleteMessageParams)
-
-  let res = await snodeRpc('delete_all', deleteMessageParams, snode, userPubKey.key);
+  let lokiRpcRes = await snodeRpc('delete_all', deleteMessageParams, snode, userPubKey.key);
  debugger;
 }

-const send = async (method: string, snode: Snode, publicKey?: string, parameters?: any) => {
-  let url = `https://${snode.ip}:${snode.port}/storage_rpc/v1`;
-
-  let payload = {
-    method,
-    ...parameters
-  }
-
-  let fetchOptions = {
-    method: 'POST',
-    body: JSON.stringify(payload),
-    headers: {
-      'Content-Type': 'application/json',
-      //   // 'User-Agent': 'WhatsApp',
-      // 'Accept-Language': 'en-us',
-    },
-    // timeout: 10000,
-    agent: snodeHttpsAgent
-  }
-
-  let response: any = await insecureNodeFetch(url, fetchOptions)
-  console.log({ response });
-}
-
 const getActiveOpenGroupV2CompleteUrls = async (
  convos: Array<ConversationModel>
 ): Promise<Array<string>> => {
@ -261,9 +239,24 @@ const getValidContacts = (convos: Array<ConversationModel>) => {

  const contacts = contactsModels.map(c => {
    try {
-      const profileKeyForContact = c.get('profileKey')
-        ? fromBase64ToArray(c.get('profileKey') as string)
-        : undefined;
+      const profileKey = c.get('profileKey');
+      let profileKeyForContact;
+      if (typeof profileKey === 'string') {
+        // this will throw if the profileKey is not in hex.
+        try {
+          profileKeyForContact = fromHexToArray(profileKey);
+        } catch (e) {
+          profileKeyForContact = fromBase64ToArray(profileKey);
+          // if the line above does not fail, update the stored profileKey for this convo
+          void c.setProfileKey(profileKeyForContact);
+        }
+      } else if (profileKey) {
+        window.log.warn(
+          'Got a profileKey for a contact in another format than string. Contact: ',
+          c.id
+        );
+        return null;
+      }

      return new ConfigurationMessageContact({
        publicKey: c.id,
@ -290,8 +283,12 @@ export const getCurrentConfigurationMessage = async (convos: Array<ConversationM
  if (!ourConvo) {
    window?.log?.error('Could not find our convo while building a configuration message.');
  }
-  const profileKeyFromStorage = window.storage.get('profileKey');
-  const profileKey = profileKeyFromStorage ? new Uint8Array(profileKeyFromStorage) : undefined;
+
+  const ourProfileKeyHex =
+    getConversationController()
+      .get(UserUtils.getOurPubKeyStrFromCache())
+      ?.get('profileKey') || null;
+  const profileKey = ourProfileKeyHex ? fromHexToArray(ourProfileKeyHex) : undefined;

  const profilePicture = ourConvo?.get('avatarPointer') || undefined;
  const displayName = ourConvo?.getLokiProfile()?.displayName || undefined;
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@ -601,6 +601,17 @@ const conversationsSlice = createSlice({
      return handleConversationReset(state, action);
    },

+    markConversationFullyRead(state: ConversationsStateType, action: PayloadAction<string>) {
+      if (state.selectedConversation !== action.payload) {
+        return state;
+      }
+
+      return {
+        ...state,
+        firstUnreadMessageId: undefined,
+      };
+    },
+
    openConversationExternal(
      state: ConversationsStateType,
      action: PayloadAction<{
@ -711,6 +722,7 @@ export const {
  messageChanged,
  messagesChanged,
  openConversationExternal,
+  markConversationFullyRead,
  // layout stuff
  showMessageDetailsView,
  closeMessageDetailsView,
--- a/ts/util/accountManager.ts
+++ b/ts/util/accountManager.ts
@ -157,7 +157,7 @@ async function bouncyDeleteAccount(reason?: string) {
      error && error.stack ? error.stack : error
    );
    debugger;
-      // return;
+      return;
    try {
      await deleteEverything();
    } catch (e) {