From 4de5bbfffb5d160c1b24a518efbfa5b255411576 Mon Sep 17 00:00:00 2001
From: Joe McGrath <josephmcg01@gmail.com>
Date: Tue, 24 May 2022 16:50:33 +0900
Subject: [PATCH] test(snapshot): remove obsolete snap

---
 components/ui/Chat/Embeds/File/File.html      |   7 +-
 components/ui/Chat/Embeds/File/File.vue       |   9 +
 components/ui/Chat/Image/Image.vue            |   7 +-
 components/views/chat/message/Message.html    |   7 +-
 components/views/chat/message/Message.vue     |  10 +-
 components/views/files/controls/Controls.vue  |   8 +-
 components/views/files/rename/Rename.vue      |   4 +-
 components/views/files/view/View.vue          |   2 +-
 libraries/Files/TextileFileSystem.ts          |   2 +-
 .../Files/remote/abstracts/Bucket.abstract.ts |  17 +-
 .../Files/remote/abstracts/RFM.abstract.ts    |   9 +-
 .../Files/remote/textile/PrivateBucket.ts     |  31 +-
 .../Files/remote/textile/SharedBucket.ts      |  70 ++
 .../Files/test/TextileFileSystem.test.ts      |  14 +-
 libraries/Files/types/filesystem.ts           |  15 +
 libraries/Textile/BucketManager.test.ts       | 387 -------
 libraries/Textile/BucketManager.ts            | 196 ----
 libraries/Textile/TextileManager.ts           |  22 +-
 .../__snapshots__/BucketManager.test.ts.snap  |  13 -
 .../__snapshots__/encoders.test.ts.snap       | 949 ++----------------
 libraries/Textile/encoders.test.ts            |   4 -
 libraries/Textile/encoders.ts                 |  28 +-
 pages/files/browse/index.vue                  |   8 +-
 plugins/local/classLoader.ts                  |   3 -
 store/accounts/actions.ts                     |   7 +-
 store/textile/actions.ts                      |  24 +-
 store/textile/mutations.test.ts               |   2 -
 store/ui/mutations.ts                         |   5 +-
 store/ui/types.ts                             |   4 +-
 types/messaging.d.ts                          |   2 -
 types/textile/mailbox.ts                      |  10 +-
 utilities/Messaging.test.ts                   |  27 +-
 .../__snapshots__/Messaging.test.ts.snap      |   8 -
 33 files changed, 300 insertions(+), 1611 deletions(-)
 create mode 100644 libraries/Files/remote/textile/SharedBucket.ts
 delete mode 100644 libraries/Textile/BucketManager.test.ts
 delete mode 100644 libraries/Textile/BucketManager.ts
 delete mode 100644 libraries/Textile/__snapshots__/BucketManager.test.ts.snap

diff --git a/components/ui/Chat/Embeds/File/File.html b/components/ui/Chat/Embeds/File/File.html
index 8b91f4d416..a6bcff932c 100644
--- a/components/ui/Chat/Embeds/File/File.html
+++ b/components/ui/Chat/Embeds/File/File.html
@@ -6,12 +6,7 @@
       <TypographySubtitle :size="6" :text="`${file.name}`" />
       <TypographyText :text="`${file.type} - ${getFileSize}`" />
     </div>
-    <a
-      :href="file.url"
-      target="_blank"
-      class="button is-primary"
-      data-cy="chat-file"
-    >
+    <a @click="download" class="button is-primary" data-cy="chat-file">
       <download-icon size="1x" class="download" />
     </a>
   </template>
diff --git a/components/ui/Chat/Embeds/File/File.vue b/components/ui/Chat/Embeds/File/File.vue
index b5ef373098..ebeac60e53 100644
--- a/components/ui/Chat/Embeds/File/File.vue
+++ b/components/ui/Chat/Embeds/File/File.vue
@@ -24,6 +24,15 @@ export default Vue.extend({
       return isMimeEmbeddableImage(this.file.type)
     },
   },
+  methods: {
+    download() {
+      this.$TextileManager.sharedBucket?.pullFile(
+        this.file.id,
+        this.file.name,
+        this.file.size,
+      )
+    },
+  },
 })
 </script>
 <style lang="less" scoped src="./File.less"></style>
diff --git a/components/ui/Chat/Image/Image.vue b/components/ui/Chat/Image/Image.vue
index d2e546d473..855d514fe4 100644
--- a/components/ui/Chat/Image/Image.vue
+++ b/components/ui/Chat/Image/Image.vue
@@ -1,8 +1,9 @@
-<template src="./Image.html" />
+<template src="./Image.html"></template>
 <script lang="ts">
 import Vue, { PropType } from 'vue'
 import { ImageIcon, DownloadIcon } from 'satellite-lucide-icons'
-import { FileMessage, ImageMessage } from '~/types/textile/mailbox'
+import { FileMessage } from '~/types/textile/mailbox'
+// @ts-ignore
 import placeholderImage from '~/assets/svg/mascot/sad_curious.svg'
 
 export default Vue.extend({
@@ -20,7 +21,7 @@ export default Vue.extend({
       default: false,
     },
     image: {
-      type: Object as PropType<ImageMessage>,
+      type: Object as PropType<FileMessage>,
       required: true,
     },
   },
diff --git a/components/views/chat/message/Message.html b/components/views/chat/message/Message.html
index 5e6dbeeb61..676688ab48 100644
--- a/components/views/chat/message/Message.html
+++ b/components/views/chat/message/Message.html
@@ -49,13 +49,8 @@
         ({{$t('ui.edited')}})
       </span>
     </template>
-    <UiChatImage
-      v-if="message.type === 'image'"
-      :image="message.payload"
-      alt=""
-    />
     <MessageGlyph
-      v-else-if="message.type === 'glyph'"
+      v-if="message.type === 'glyph'"
       :source="message.payload"
       :pack="message.pack"
     />
diff --git a/components/views/chat/message/Message.vue b/components/views/chat/message/Message.vue
index 4c2d1cf9c1..7d856a77bd 100644
--- a/components/views/chat/message/Message.vue
+++ b/components/views/chat/message/Message.vue
@@ -195,11 +195,11 @@ export default Vue.extend({
       this.$toast.show(this.$t('ui.copied') as string)
     },
     saveImage() {
-      const a = document.createElement('a')
-      a.setAttribute('type', 'hidden')
-      a.setAttribute('download', 'download')
-      a.href = URL.createObjectURL(this.blob)
-      a.click()
+      this.$TextileManager.sharedBucket?.pullFile(
+        this.message.payload.id,
+        this.message.payload.name,
+        this.message.payload.size,
+      )
     },
     /**
      * @method toPng
diff --git a/components/views/files/controls/Controls.vue b/components/views/files/controls/Controls.vue
index f12d969f7e..da4da1bf81 100644
--- a/components/views/files/controls/Controls.vue
+++ b/components/views/files/controls/Controls.vue
@@ -89,7 +89,9 @@ export default Vue.extend({
         return
       }
       this.text = ''
-      await this.$TextileManager.bucket?.updateIndex(this.$FileSystem.export)
+      await this.$TextileManager.privateBucket?.updateIndex(
+        this.$FileSystem.export,
+      )
       this.$store.commit('ui/setFilesUploadStatus', '')
 
       this.$emit('forceRender')
@@ -185,7 +187,9 @@ export default Vue.extend({
           'ui/setFilesUploadStatus',
           this.$t('pages.files.status.index'),
         )
-        await this.$TextileManager.bucket?.updateIndex(this.$FileSystem.export)
+        await this.$TextileManager.privateBucket?.updateIndex(
+          this.$FileSystem.export,
+        )
       }
 
       this.$store.commit('ui/setFilesUploadStatus', '')
diff --git a/components/views/files/rename/Rename.vue b/components/views/files/rename/Rename.vue
index f6a188ffd6..4e7e4746bf 100644
--- a/components/views/files/rename/Rename.vue
+++ b/components/views/files/rename/Rename.vue
@@ -73,7 +73,9 @@ export default Vue.extend({
         'ui/setFilesUploadStatus',
         this.$t('pages.files.status.index'),
       )
-      await this.$TextileManager.bucket?.updateIndex(this.$FileSystem.export)
+      await this.$TextileManager.privateBucket?.updateIndex(
+        this.$FileSystem.export,
+      )
       this.$store.commit('ui/setFilesUploadStatus', '')
     },
   },
diff --git a/components/views/files/view/View.vue b/components/views/files/view/View.vue
index 68dde831e4..4c0a000ddf 100644
--- a/components/views/files/view/View.vue
+++ b/components/views/files/view/View.vue
@@ -48,7 +48,7 @@ export default Vue.extend({
           .slice(((this.file.name.lastIndexOf('.') - 1) >>> 0) + 2)
           .toLowerCase()
 
-        await this.$TextileManager.bucket?.pullFile(
+        await this.$TextileManager.privateBucket?.pullFile(
           this.file.id,
           this.file.extension === fileExt
             ? this.file.name
diff --git a/libraries/Files/TextileFileSystem.ts b/libraries/Files/TextileFileSystem.ts
index a4be48a66e..f09936b1d2 100644
--- a/libraries/Files/TextileFileSystem.ts
+++ b/libraries/Files/TextileFileSystem.ts
@@ -16,7 +16,7 @@ export class TextileFileSystem extends FilSystem {
    * @returns {PrivateBucket} bucket global to upload files to textile
    */
   get bucket(): PrivateBucket {
-    return Vue.prototype.$TextileManager.bucket
+    return Vue.prototype.$TextileManager.privateBucket
   }
 
   /**
diff --git a/libraries/Files/remote/abstracts/Bucket.abstract.ts b/libraries/Files/remote/abstracts/Bucket.abstract.ts
index 19c4d37f34..c0f008632e 100644
--- a/libraries/Files/remote/abstracts/Bucket.abstract.ts
+++ b/libraries/Files/remote/abstracts/Bucket.abstract.ts
@@ -1,7 +1,10 @@
 import { Buckets, Root } from '@textile/buckets'
 import { createWriteStream } from 'streamsaver'
 import { Config } from '~/config'
-import { FileSystemExport } from '~/libraries/Files/types/filesystem'
+import {
+  FileSystemExport,
+  SharedBucketIndex,
+} from '~/libraries/Files/types/filesystem'
 import { TextileInitializationData } from '~/types/textile/manager'
 import { RFM } from '~/libraries/Files/remote/abstracts/RFM.abstract'
 
@@ -16,7 +19,7 @@ export abstract class BucketAbstract extends RFM {
     this._textile = textile
   }
 
-  abstract get index(): FileSystemExport | undefined
+  abstract get index(): FileSystemExport | SharedBucketIndex | undefined
 
   /**
    * @method getBucket
@@ -24,7 +27,7 @@ export abstract class BucketAbstract extends RFM {
    * @param param0 bucket name and encrypted status
    * @returns a promise that resolves when the initialization completes
    */
-  async getBucket({ name, encrypted }: { name: string; encrypted: boolean }) {
+  async getBucket({ name, encrypted }: { name: string; encrypted?: boolean }) {
     if (!Config.textile.key) {
       throw new Error('Textile key not found')
     }
@@ -53,8 +56,13 @@ export abstract class BucketAbstract extends RFM {
    * @param {File} file file to be uploaded
    * @param {string} path uuid to maintain unique bucket paths
    * @param {Function} progressCallback used to show progress meter in componment that calls this method
+   * @returns {string} path to file, used moreso for shared buckets
    */
-  async pushFile(file: File, path: string, progressCallback: Function) {
+  async pushFile(
+    file: File,
+    path: string,
+    progressCallback: Function,
+  ): Promise<string> {
     if (!this._buckets || !this._key) {
       throw new Error('Bucket or bucket key not found')
     }
@@ -74,6 +82,7 @@ export abstract class BucketAbstract extends RFM {
       },
     )
     this._root = res.root
+    return res.path.path
   }
 
   private _getStream(file: File) {
diff --git a/libraries/Files/remote/abstracts/RFM.abstract.ts b/libraries/Files/remote/abstracts/RFM.abstract.ts
index 672d16324a..3b663274f5 100644
--- a/libraries/Files/remote/abstracts/RFM.abstract.ts
+++ b/libraries/Files/remote/abstracts/RFM.abstract.ts
@@ -1,6 +1,9 @@
 // Remote file management
 import { FileSystemErrors } from '../../errors/Errors'
-import { FileSystemExport } from '~/libraries/Files/types/filesystem'
+import {
+  FileSystemExport,
+  SharedBucketIndex,
+} from '~/libraries/Files/types/filesystem'
 
 export abstract class RFM {
   constructor() {
@@ -8,9 +11,9 @@ export abstract class RFM {
       throw new Error(FileSystemErrors.RFM_ABSTRACT_ONLY)
   }
 
-  abstract updateIndex(index: FileSystemExport): void
+  abstract updateIndex(index: FileSystemExport | SharedBucketIndex): void
 
-  abstract get index(): FileSystemExport | undefined
+  abstract get index(): FileSystemExport | SharedBucketIndex | undefined
 
   abstract pullFile(id: string, name: string, size: number): void
 
diff --git a/libraries/Files/remote/textile/PrivateBucket.ts b/libraries/Files/remote/textile/PrivateBucket.ts
index d2f29b4989..e5c0168e96 100644
--- a/libraries/Files/remote/textile/PrivateBucket.ts
+++ b/libraries/Files/remote/textile/PrivateBucket.ts
@@ -1,12 +1,11 @@
-import { BucketAbstract } from '../abstracts/Bucket.abstract'
+import Vue from 'vue'
+import { BucketAbstract } from '~/libraries/Files/remote/abstracts/Bucket.abstract'
 import { Config } from '~/config'
-import {
-  FileSystemExport,
-  FILESYSTEM_TYPE,
-} from '~/libraries/Files/types/filesystem'
+import { FileSystemExport } from '~/libraries/Files/types/filesystem'
 
 export class PrivateBucket extends BucketAbstract {
   private _index?: FileSystemExport
+
   /**
    * @getter
    * @returns file system export data
@@ -19,18 +18,11 @@ export class PrivateBucket extends BucketAbstract {
    * @method init
    * @description Initializes bucket
    * @param name bucket name
-   * @returns {Promise<FileSystemExport>} a promise that resolves when the initialization completes
    */
-  async init({
-    name,
-    encrypted,
-  }: {
-    name: string
-    encrypted: boolean
-  }): Promise<FileSystemExport> {
+  async init({ name, encrypted }: { name: string; encrypted: boolean }) {
     await this.getBucket({ name, encrypted })
     if (!this._buckets || !this._key) {
-      throw new Error('woah')
+      throw new Error('Bucket or bucket key not found')
     }
     try {
       const data = []
@@ -45,16 +37,9 @@ export class PrivateBucket extends BucketAbstract {
           type: 'application/json',
         }).text(),
       )
-
-      if (!this._index) throw new Error('Index not found')
-
-      return this._index
+      Vue.prototype.$Logger.log('File System', 'Initialized')
     } catch (e) {
-      return {
-        type: FILESYSTEM_TYPE.DEFAULT,
-        version: 1,
-        content: [],
-      }
+      Vue.prototype.$Logger.log('File System', 'Not Found')
     }
   }
 
diff --git a/libraries/Files/remote/textile/SharedBucket.ts b/libraries/Files/remote/textile/SharedBucket.ts
new file mode 100644
index 0000000000..49a139820c
--- /dev/null
+++ b/libraries/Files/remote/textile/SharedBucket.ts
@@ -0,0 +1,70 @@
+import { BucketAbstract } from '~/libraries/Files/remote/abstracts/Bucket.abstract'
+import { Config } from '~/config'
+import {
+  FILESYSTEM_TYPE,
+  SharedBucketIndex,
+} from '~/libraries/Files/types/filesystem'
+
+export class SharedBucket extends BucketAbstract {
+  private _index: SharedBucketIndex = {
+    type: FILESYSTEM_TYPE.DEFAULT,
+    version: 1,
+    content: [],
+  }
+
+  /**
+   * @getter
+   * @returns file system export data
+   */
+  get index(): SharedBucketIndex {
+    return this._index
+  }
+
+  /**
+   * @method init
+   * @description Initializes bucket
+   * @param name bucket name
+   */
+  async init({ name }: { name: string }) {
+    await this.getBucket({ name })
+    if (!this._buckets || !this._key) {
+      throw new Error('Bucket or bucket key not found')
+    }
+    // todo - add index tracking capabilities to shared bucket
+    // try {
+    //   const data = []
+    //   for await (const bytes of this._buckets.pullPath(
+    //     this._key,
+    //     Config.textile.fsTable,
+    //   )) {
+    //     data.push(bytes)
+    //   }
+    //   this._index = JSON.parse(
+    //     await new Blob(data, {
+    //       type: 'application/json',
+    //     }).text(),
+    //   )
+    // } catch (e) {
+    //   console.log(e)
+    // }
+  }
+
+  /**
+   * @method updateIndex
+   * @param index SharedBucketIndex
+   * @description sets index data and root
+   */
+  async updateIndex(index: SharedBucketIndex) {
+    if (!this._buckets || !this._key) {
+      throw new Error('Bucket or bucket key not found')
+    }
+    this._index = index
+    const res = await this._buckets.pushPath(
+      this._key,
+      Config.textile.fsTable,
+      Buffer.from(JSON.stringify(index)),
+      { root: this._root },
+    )
+    this._root = res.root
+  }
+}
diff --git a/libraries/Files/test/TextileFileSystem.test.ts b/libraries/Files/test/TextileFileSystem.test.ts
index cc894b254d..4feccfc979 100644
--- a/libraries/Files/test/TextileFileSystem.test.ts
+++ b/libraries/Files/test/TextileFileSystem.test.ts
@@ -10,9 +10,9 @@ Vue.prototype.$TextileManager = new TextileManager()
 describe('', () => {
   Vue.prototype.$TextileManager = new TextileManager()
   const TMConstructor = Vue.prototype.$TextileManager
-  TMConstructor.bucket = jest.fn()
-  TMConstructor.bucket.removeFile = jest.fn()
-  TMConstructor.bucket.pushFile = jest.fn()
+  TMConstructor.privateBucket = jest.fn()
+  TMConstructor.privateBucket.removeFile = jest.fn()
+  TMConstructor.privateBucket.pushFile = jest.fn()
   const TextileFileSystemConstructor = new TextileFileSystem()
   const inst = TextileFileSystemConstructor
   const state = inst.bucket
@@ -24,7 +24,7 @@ describe('', () => {
 
   test('TextileFileSystem.removeFile', async () => {
     await inst.removeFile('TestFile.png')
-    expect(TMConstructor.bucket.removeFile).toHaveBeenCalled()
+    expect(TMConstructor.privateBucket.removeFile).toHaveBeenCalled()
   })
 
   test('TextileFileSystem.uploadFile', async () => {
@@ -41,7 +41,7 @@ describe('', () => {
     }
 
     await inst.uploadFile(testFile, nsfw, cbFunction)
-    expect(TMConstructor.bucket.pushFile).toHaveBeenCalled()
+    expect(TMConstructor.privateBucket.pushFile).toHaveBeenCalled()
   })
 
   // This test is skipped due to it exceeding the timeout (5000 ms).
@@ -59,7 +59,7 @@ describe('', () => {
     }
 
     await inst.uploadFile(testBlobFile, nsfw, cbFunction)
-    expect(TMConstructor.bucket.pushFile).toHaveBeenCalled()
+    expect(TMConstructor.privateBucket.pushFile).toHaveBeenCalled()
   })
 
   test.skip('TextileFileSystem.uploadFile for png file', async () => {
@@ -75,6 +75,6 @@ describe('', () => {
     }
 
     await inst.uploadFile(testBlobFile, nsfw, cbFunction)
-    expect(TMConstructor.bucket.pushFile).toHaveBeenCalled()
+    expect(TMConstructor.privateBucket.pushFile).toHaveBeenCalled()
   })
 })
diff --git a/libraries/Files/types/filesystem.ts b/libraries/Files/types/filesystem.ts
index 62f2dea48b..1a6962d9cd 100644
--- a/libraries/Files/types/filesystem.ts
+++ b/libraries/Files/types/filesystem.ts
@@ -28,8 +28,23 @@ export interface ExportDirectory extends ExportSharedProps {
 
 export type ExportItem = ExportFile | ExportDirectory
 
+// private file system export
 export type FileSystemExport = {
   type: FILESYSTEM_TYPE
   version: number
   content: Array<ExportItem>
 }
+
+export interface SharedBucketIndexItem {
+  id: string
+  name: string
+  url: string
+  size: number
+  nsfw: boolean
+}
+
+export type SharedBucketIndex = {
+  type: FILESYSTEM_TYPE
+  version: number
+  content: SharedBucketIndexItem[]
+}
diff --git a/libraries/Textile/BucketManager.test.ts b/libraries/Textile/BucketManager.test.ts
deleted file mode 100644
index 9272cd100a..0000000000
--- a/libraries/Textile/BucketManager.test.ts
+++ /dev/null
@@ -1,387 +0,0 @@
-import * as web3 from '@solana/web3.js'
-import * as index from '@textile/grpc-authentication/dist/cjs/index'
-import * as hub from '@textile/hub'
-import * as BucketManager from '~/libraries/Textile/BucketManager'
-const BucketManagerDefault = BucketManager.default
-
-describe('BucketManager.default.progressParse', () => {
-  let inst48: any
-  let inst47: any
-  let inst46: any
-  let inst49: any
-  let inst43: any
-  let inst42: any
-  let inst41: any
-  let inst44: any
-  let inst45: any
-  let inst23: any
-  let inst22: any
-  let inst21: any
-  let inst24: any
-  let inst25: any
-  let inst18: any
-  let inst17: any
-  let inst16: any
-  let inst19: any
-  let inst20: any
-  let inst13: any
-  let inst12: any
-  let inst11: any
-  let inst14: any
-  let inst15: any
-  let inst8: any
-  let inst7: any
-  let inst: any
-  let inst9: any
-  let inst10: any
-  let inst4: any
-  let inst3: any
-  let inst2: any
-  let inst5: any
-  let inst6: any
-  let DefaultBucketManager: any
-
-  beforeEach(() => {
-    inst48 = new hub.Client(undefined, true)
-    inst47 = new Uint8Array([])
-    inst46 = new Uint8Array([])
-    inst49 = new Uint8Array([])
-    DefaultBucketManager = BucketManager.default
-    inst43 = new hub.Client(undefined, true)
-    inst42 = new Uint8Array([])
-    inst41 = new Uint8Array([])
-    inst44 = new Uint8Array([])
-    DefaultBucketManager = BucketManager.default
-    inst45 = new DefaultBucketManager(
-      {
-        identity: {
-          sign: () => inst41,
-          public: { verify: () => true, bytes: inst42 },
-        },
-        client: inst43,
-        users: hub.Users.withUserAuth(
-          { key: '', sig: '', msg: '', token: undefined },
-          undefined,
-        ),
-        wallet: {
-          mnemonic: '',
-          keypair: web3.Keypair.generate(),
-          path: undefined,
-          address: '',
-        },
-      },
-      { sign: () => inst44, public: null },
-      '',
-    )
-    DefaultBucketManager = BucketManager.default
-    DefaultBucketManager = BucketManager.default
-    DefaultBucketManager = BucketManager.default
-    inst23 = new hub.Client(undefined, true)
-    inst22 = new Uint8Array([])
-    inst21 = new Uint8Array([])
-    inst24 = new Uint8Array([])
-    DefaultBucketManager = BucketManager.default
-    inst25 = new DefaultBucketManager(
-      {
-        identity: {
-          sign: () => inst21,
-          public: { verify: () => false, bytes: inst22 },
-        },
-        client: inst23,
-        users: hub.Users.withUserAuth(
-          {
-            key: 'elio@example.com',
-            sig: '3d4e60b996ff9c5d5788e333a0cba6f238a22c6c0f94788870e1a9ecd482e152',
-            msg: 'Error in retrieving email.',
-            token: undefined,
-          },
-          undefined,
-        ),
-        wallet: {
-          mnemonic: 'NoWiFi4you',
-          keypair: web3.Keypair.generate(),
-          path: undefined,
-          address: '192.168.1.5',
-        },
-      },
-      { sign: () => inst24, public: null },
-      'Janet Homenick',
-    )
-    inst18 = new hub.Client(undefined, true)
-    inst17 = new Uint8Array([])
-    inst16 = new Uint8Array([])
-    inst19 = new Uint8Array([])
-    DefaultBucketManager = BucketManager.default
-    inst20 = new DefaultBucketManager(
-      {
-        identity: {
-          sign: () => inst16,
-          public: { verify: () => true, bytes: inst17 },
-        },
-        client: inst18,
-        users: hub.Users.withUserAuth(
-          {
-            key: 'Dillenberg',
-            sig: '3d4e60b996ff9c5d5788e333a0cba6f238a22c6c0f94788870e1a9ecd482e152',
-            msg: 'Error getting key from: %s',
-            token: undefined,
-          },
-          undefined,
-        ),
-        wallet: {
-          mnemonic: 'YouarenotAllowed2Use',
-          keypair: web3.Keypair.generate(),
-          path: undefined,
-          address: '192.168.1.5',
-        },
-      },
-      { sign: () => inst19, public: null },
-      'Becky Bednar',
-    )
-    inst13 = new hub.Client(undefined, true)
-    inst12 = new Uint8Array([])
-    inst11 = new Uint8Array([])
-    inst14 = new Uint8Array([])
-    DefaultBucketManager = BucketManager.default
-    inst15 = new DefaultBucketManager(
-      {
-        identity: {
-          sign: () => inst11,
-          public: { verify: () => false, bytes: inst12 },
-        },
-        client: inst13,
-        users: hub.Users.withUserAuth(
-          {
-            key: 'Dillenberg',
-            sig: '3d4e60b996ff9c5d5788e333a0cba6f238a22c6c0f94788870e1a9ecd482e152',
-            msg: 'does not exist',
-            token: undefined,
-          },
-          undefined,
-        ),
-        wallet: {
-          mnemonic: '!Lov3MyPianoPony',
-          keypair: web3.Keypair.generate(),
-          path: undefined,
-          address: '192.168.1.5',
-        },
-      },
-      { sign: () => inst14, public: null },
-      'Ronald Keeling',
-    )
-    inst8 = new hub.Client(undefined, true)
-    inst7 = new Uint8Array([])
-    inst = new Uint8Array([])
-    inst9 = new Uint8Array([])
-    DefaultBucketManager = BucketManager.default
-    inst10 = new DefaultBucketManager(
-      {
-        identity: {
-          sign: () => inst,
-          public: { verify: () => true, bytes: inst7 },
-        },
-        client: inst8,
-        users: hub.Users.withUserAuth(
-          {
-            key: 'Elio',
-            sig: '3d4e60b996ff9c5d5788e333a0cba6f238a22c6c0f94788870e1a9ecd482e152',
-            msg: 'Could not find an existing submission in location.  rubric is original.',
-            token: undefined,
-          },
-          undefined,
-        ),
-        wallet: {
-          mnemonic: 'accessdenied4u',
-          keypair: web3.Keypair.generate(),
-          path: undefined,
-          address: '0.0.0.0',
-        },
-      },
-      { sign: () => inst9, public: null },
-      'Janet Homenick',
-    )
-    inst4 = new hub.Client(undefined, true)
-    inst3 = new Uint8Array([])
-    inst2 = new Uint8Array([])
-    inst5 = new Uint8Array([])
-    DefaultBucketManager = BucketManager.default
-    inst6 = new DefaultBucketManager(
-      {
-        identity: {
-          sign: () => inst2,
-          public: { verify: () => true, bytes: inst3 },
-        },
-        client: inst4,
-        users: hub.Users.withUserAuth(
-          {
-            key: 'Dillenberg',
-            sig: '3d4e60b996ff9c5d5788e333a0cba6f238a22c6c0f94788870e1a9ecd482e152',
-            msg: 'invalid option',
-            token: undefined,
-          },
-          undefined,
-        ),
-        wallet: {
-          mnemonic: '!Lov3MyPianoPony',
-          keypair: web3.Keypair.generate(),
-          path: undefined,
-          address: '192.168.1.5',
-        },
-      },
-      { sign: () => inst5, public: null },
-      'Becky Bednar',
-    )
-  })
-
-  test('0', () => {
-    const result: any = inst6.progressParse(10, 0)
-    expect(result).toMatchSnapshot()
-  })
-
-  test('1', () => {
-    const result: any = inst10.progressParse(2, 300)
-    expect(result).toMatchSnapshot()
-  })
-
-  test('2', () => {
-    const result: any = inst15.progressParse(16, 10000)
-    expect(result).toMatchSnapshot()
-  })
-
-  test('3', () => {
-    const result: any = inst20.progressParse(1, 0.0)
-    expect(result).toMatchSnapshot()
-  })
-
-  test('4', () => {
-    const result: any = inst25.progressParse(256, 0.0)
-    expect(result).toMatchSnapshot()
-  })
-
-  test('5', () => {
-    const result: any = inst45.progressParse(NaN, NaN)
-    expect(result).toMatchSnapshot()
-  })
-})
-
-describe('BucketManager.default.getBucket', () => {
-  let inst4: any
-  let inst3: any
-  let inst2: any
-  let inst5: any
-
-  beforeEach(() => {
-    inst4 = new hub.Client(undefined, undefined)
-    inst3 = new Uint8Array([])
-    inst2 = new Uint8Array([])
-    const DefaultBucketManager = BucketManager.default
-    inst5 = new DefaultBucketManager(
-      {
-        identity: {
-          sign: () => inst2,
-          public: { verify: () => true, bytes: inst3 },
-        },
-        client: inst4,
-        users: hub.Users.withUserAuth(
-          () => ({ key: '', sig: '', msg: '', token: '' }),
-          undefined,
-        ),
-        wallet: {
-          mnemonic: undefined,
-          keypair: web3.Keypair.generate(),
-          path: undefined,
-          address: '',
-        },
-      },
-      null,
-      '',
-    )
-  })
-
-  test('0', async () => {
-    await inst5.getBucket()
-  })
-})
-
-describe('BucketManager.default.getLinks', () => {
-  let inst4: any
-  let inst3: any
-  let inst2: any
-  let inst5: any
-
-  beforeEach(() => {
-    inst4 = new hub.Client(undefined, false)
-    inst3 = new Uint8Array([])
-    inst2 = new Uint8Array([])
-    const DefaultBucketManager = BucketManager.default
-    inst5 = new DefaultBucketManager(
-      {
-        identity: {
-          sign: () => inst2,
-          public: { verify: () => false, bytes: inst3 },
-        },
-        client: inst4,
-        users: hub.Users.copyAuth(
-          index.GrpcAuthentication.withUserAuth(
-            { key: '', sig: '', msg: '', token: '' },
-            undefined,
-          ),
-          undefined,
-        ),
-        wallet: {
-          mnemonic: '',
-          keypair: web3.Keypair.generate(),
-          path: '',
-          address: '',
-        },
-      },
-      null,
-      '',
-    )
-  })
-
-  test('0', async () => {
-    await inst5.getLinks()
-  })
-
-  describe('BucketManager.default.fetchIndex', () => {
-    let inst4: any
-    let inst3: any
-    let inst2: any
-    let inst5: any
-
-    beforeEach(() => {
-      inst4 = new hub.Client(undefined, true)
-      inst3 = new Uint8Array([])
-      inst2 = new Uint8Array([])
-      inst5 = new BucketManagerDefault(
-        {
-          identity: {
-            sign: () => inst2,
-            public: { verify: () => false, bytes: inst3 },
-          },
-          client: inst4,
-          users: hub.Users.copyAuth(
-            index.GrpcAuthentication.withUserAuth(
-              () => ({ key: '', sig: '', msg: '', token: '' }),
-              undefined,
-            ),
-            undefined,
-          ),
-          wallet: {
-            mnemonic: undefined,
-            keypair: web3.Keypair.generate(),
-            path: undefined,
-            address: '',
-          },
-        },
-        undefined,
-        '',
-      )
-    })
-
-    test('0', async () => {
-      await inst5.fetchIndex()
-    })
-  })
-})
diff --git a/libraries/Textile/BucketManager.ts b/libraries/Textile/BucketManager.ts
deleted file mode 100644
index 3376a7f88b..0000000000
--- a/libraries/Textile/BucketManager.ts
+++ /dev/null
@@ -1,196 +0,0 @@
-import { Buckets, Links, PushPathResult, Root } from '@textile/buckets'
-import { Identity } from '@textile/crypto'
-import { Config } from '~/config'
-import { TextileInitializationData } from '~/types/textile/manager'
-
-/* TODO: Buckets are not yet secure - AP-402
- encrypt storage and allow the recipent to decrypt with
- their priv key. */
-export default class BucketManager {
-  buckets: Buckets | null
-  bucketKey: Root['key'] | null
-  textile: TextileInitializationData
-  identity: Identity
-  bucketName: string
-  prefix: string
-
-  constructor(
-    textile: TextileInitializationData,
-    identity: Identity,
-    prefix: string,
-  ) {
-    this.identity = identity
-    this.textile = textile
-    this.buckets = null
-    this.bucketKey = null
-    this.bucketName = 'v74files'
-    this.prefix = prefix
-  }
-
-  /**
-   * @method progressParse
-   * @description handles progress math from file size
-   * @param uploaded how much of file has been uploaded
-   * @param2 total actual size of file
-   * @example progressParse(returnedNumber, file.size)
-   */
-  private progressParse(uploaded: number, total: number) {
-    return (uploaded / total) * 100
-  }
-
-  async init() {
-    if (!Config.textile.key) {
-      throw new Error('Textile key not found')
-    }
-    this.buckets = await Buckets.withKeyInfo(
-      { key: Config.textile.key },
-      { host: Config.textile.apiUrl },
-    )
-    await this.buckets.getToken(this.identity)
-    const result = await this.buckets.getOrCreate(
-      `hub.textile.io/ipfs/${this.identity}/${this.prefix}`,
-    )
-    if (!result.root) throw new Error('failed to open buckets')
-    this.bucketKey = result.root.key
-    await this.ensureIndex()
-  }
-
-  async removeFromIndex(file: File) {
-    const path = `${this.prefix}/index.json`
-    if (!this.buckets || !this.bucketKey) return
-    const bytesStream = await this.buckets?.pullPath(this.bucketKey, path)
-    let array: any[] = []
-    if (bytesStream) {
-      const next = await bytesStream.next()
-      const value = next.value
-      const oldIndex = JSON.parse(Buffer.from(value).toString())
-      array = [...oldIndex.paths]
-    }
-
-    const filtered = array.filter((item) => {
-      // @ts-ignore
-      return item.file.name !== file.file.name
-    })
-
-    const index = {
-      date: new Date().getTime(),
-      meta: {},
-      paths: filtered,
-    }
-    // Store the index in the Bucket (or in the Thread later)
-    const buf = Buffer.from(JSON.stringify(index, null, 2))
-    await this.buckets.pushPath(this.bucketKey, path, buf)
-  }
-
-  async addToIndex(file: File, root: string | undefined, remotePath: string) {
-    const path = `${this.prefix}/index.json`
-    if (!this.buckets || !this.bucketKey) return
-    const bytesStream = await this.buckets?.pullPath(this.bucketKey, path)
-    let array: any[] = []
-    if (bytesStream) {
-      const next = await bytesStream.next()
-      const value = next.value
-      const oldIndex = JSON.parse(Buffer.from(value).toString())
-      array = [...oldIndex.paths]
-    }
-    const index = {
-      date: new Date().getTime(),
-      meta: {},
-      paths: [
-        ...array,
-        {
-          at: Date.now(),
-          file: {
-            name: file.name,
-            size: file.size,
-            type: file.type,
-            author: this.prefix,
-          },
-          path: remotePath,
-          remote: encodeURI(`${Config.textile.browser}${root}${remotePath}`),
-        },
-      ],
-    }
-    // Store the index in the Bucket (or in the Thread later)
-    const buf = Buffer.from(JSON.stringify(index, null, 1))
-    await this.buckets.pushPath(this.bucketKey, path, buf)
-  }
-
-  async ensureIndex(): Promise<boolean> {
-    const path = `${this.prefix}/index.json`
-    return new Promise((resolve) => {
-      if (!this.buckets || !this.bucketKey) return null
-      this.buckets
-        .listPath(this.bucketKey, path)
-        .then(() => {
-          resolve(true)
-        })
-        .catch(async (e) => {
-          const index = {
-            date: new Date().getTime(),
-            meta: {},
-            paths: [],
-          }
-          // Store the index in the Bucket (or in the Thread later)
-          const buf = Buffer.from(JSON.stringify(index, null, 2))
-          if (!this.buckets || !this.bucketKey) return null
-          await this.buckets.pushPath(this.bucketKey, path, buf)
-          resolve(false)
-        })
-    })
-  }
-
-  async fetchIndex(): Promise<object> {
-    const path = `${this.prefix}/index.json`
-    if (!this.buckets || !this.bucketKey) return {}
-    const bytesStream = await this.buckets?.pullPath(this.bucketKey, path)
-    const next = await bytesStream.next()
-    const value = next.value
-    const index = JSON.parse(Buffer.from(value).toString())
-    return index
-  }
-
-  async pushFile(
-    file: File,
-    path: string,
-    progress?: CallableFunction,
-  ): Promise<PushPathResult> {
-    return new Promise((resolve, reject) => {
-      const reader = new FileReader()
-      reader.onabort = () => reject(new Error('file reading was aborted'))
-      reader.onerror = () => reject(new Error('file reading has failed'))
-      reader.onload = () => {
-        if (!this.buckets || !this.bucketKey) {
-          reject(new Error('Please init first'))
-          return
-        }
-        const binaryStr = reader.result
-        this.buckets
-          .pushPath(this.bucketKey, `${path}`, binaryStr, {
-            progress: (num) => {
-              if (progress && num) progress(this.progressParse(num, file.size))
-            },
-          })
-          .then((raw) => {
-            resolve(raw)
-          })
-          .catch((error) => {
-            throw error
-          })
-      }
-      reader.readAsArrayBuffer(file)
-    })
-  }
-
-  async getBucket(): Promise<Root | undefined> {
-    if (!this.buckets) return undefined
-    const roots = await this.buckets.list()
-    return roots.find((bucket) => bucket.name === this.bucketName)
-  }
-
-  async getLinks(): Promise<Links | undefined> {
-    if (!this.buckets || !this.bucketKey) return undefined
-    const links = await this.buckets.links(this.bucketKey)
-    return links
-  }
-}
diff --git a/libraries/Textile/TextileManager.ts b/libraries/Textile/TextileManager.ts
index 12d2520e88..ebaefc1aaf 100644
--- a/libraries/Textile/TextileManager.ts
+++ b/libraries/Textile/TextileManager.ts
@@ -1,8 +1,8 @@
-import { PrivateBucket } from '../Files/remote/textile/PrivateBucket'
 import { MetadataManager } from './MetadataManager'
 import { UserInfoManager } from './UserManager'
+import { PrivateBucket } from '~/libraries/Files/remote/textile/PrivateBucket'
+import { SharedBucket } from '~/libraries/Files/remote/textile/SharedBucket'
 import { Config } from '~/config'
-import BucketManager from '~/libraries/Textile/BucketManager'
 import { GroupChatManager } from '~/libraries/Textile/GroupChatManager'
 import IdentityManager from '~/libraries/Textile/IdentityManager'
 import { MailboxManager } from '~/libraries/Textile/MailboxManager'
@@ -17,8 +17,8 @@ export default class TextileManager {
   creds?: Creds
   identityManager: IdentityManager
   mailboxManager?: MailboxManager
-  bucketManager?: BucketManager
-  bucket?: PrivateBucket
+  privateBucket?: PrivateBucket
+  sharedBucket?: SharedBucket
   groupChatManager?: GroupChatManager
   metadataManager?: MetadataManager
   userInfoManager?: UserInfoManager
@@ -72,16 +72,14 @@ export default class TextileManager {
     this.mailboxManager = new MailboxManager(textile, textile.wallet.address)
     await this.mailboxManager.init()
 
-    this.bucketManager = new BucketManager(
-      textile,
-      textile.identity,
-      textile.wallet.address,
-    )
-    await this.bucketManager.init().catch((e) => console.log(e))
+    this.sharedBucket = new SharedBucket(textile)
+    await this.sharedBucket.init({
+      name: Config.textile.sharedBucket,
+    })
 
     // Initialize bucket
-    this.bucket = new PrivateBucket(textile)
-    await this.bucket.init({
+    this.privateBucket = new PrivateBucket(textile)
+    await this.privateBucket.init({
       name: Config.textile.privateBucket,
       encrypted: true,
     })
diff --git a/libraries/Textile/__snapshots__/BucketManager.test.ts.snap b/libraries/Textile/__snapshots__/BucketManager.test.ts.snap
deleted file mode 100644
index 97887160ee..0000000000
--- a/libraries/Textile/__snapshots__/BucketManager.test.ts.snap
+++ /dev/null
@@ -1,13 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`BucketManager.default.progressParse 0 1`] = `Infinity`;
-
-exports[`BucketManager.default.progressParse 1 1`] = `0.6666666666666667`;
-
-exports[`BucketManager.default.progressParse 2 1`] = `0.16`;
-
-exports[`BucketManager.default.progressParse 3 1`] = `Infinity`;
-
-exports[`BucketManager.default.progressParse 4 1`] = `Infinity`;
-
-exports[`BucketManager.default.progressParse 5 1`] = `NaN`;
diff --git a/libraries/Textile/__snapshots__/encoders.test.ts.snap b/libraries/Textile/__snapshots__/encoders.test.ts.snap
index 0247b46f9d..07a160b281 100644
--- a/libraries/Textile/__snapshots__/encoders.test.ts.snap
+++ b/libraries/Textile/__snapshots__/encoders.test.ts.snap
@@ -99,7 +99,7 @@ IntersectionType {
   "decode": [Function],
   "encode": [Function],
   "is": [Function],
-  "name": "(({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string } } & { type: \\"file\\" })",
+  "name": "(({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string, id: string } } & { type: \\"file\\" })",
   "types": Array [
     IntersectionType {
       "_tag": "IntersectionType",
@@ -212,15 +212,23 @@ IntersectionType {
       "decode": [Function],
       "encode": [Function],
       "is": [Function],
-      "name": "{ payload: { url: string, name: string, size: number, type: string } }",
+      "name": "{ payload: { url: string, name: string, size: number, type: string, id: string } }",
       "props": Object {
         "payload": InterfaceType {
           "_tag": "InterfaceType",
           "decode": [Function],
           "encode": [Function],
           "is": [Function],
-          "name": "{ url: string, name: string, size: number, type: string }",
+          "name": "{ url: string, name: string, size: number, type: string, id: string }",
           "props": Object {
+            "id": StringType {
+              "_tag": "StringType",
+              "decode": [Function],
+              "encode": [Function],
+              "is": [Function],
+              "name": "string",
+              "validate": [Function],
+            },
             "name": StringType {
               "_tag": "StringType",
               "decode": [Function],
@@ -451,196 +459,6 @@ IntersectionType {
 }
 `;
 
-exports[`check all constants imageMessage to return correctly 1`] = `
-IntersectionType {
-  "_tag": "IntersectionType",
-  "decode": [Function],
-  "encode": [Function],
-  "is": [Function],
-  "name": "(({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string } } & { type: \\"image\\" })",
-  "types": Array [
-    IntersectionType {
-      "_tag": "IntersectionType",
-      "decode": [Function],
-      "encode": [Function],
-      "is": [Function],
-      "name": "({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>)",
-      "types": Array [
-        InterfaceType {
-          "_tag": "InterfaceType",
-          "decode": [Function],
-          "encode": [Function],
-          "is": [Function],
-          "name": "{ id: string, at: number, from: string, to: string }",
-          "props": Object {
-            "at": NumberType {
-              "_tag": "NumberType",
-              "decode": [Function],
-              "encode": [Function],
-              "is": [Function],
-              "name": "number",
-              "validate": [Function],
-            },
-            "from": StringType {
-              "_tag": "StringType",
-              "decode": [Function],
-              "encode": [Function],
-              "is": [Function],
-              "name": "string",
-              "validate": [Function],
-            },
-            "id": StringType {
-              "_tag": "StringType",
-              "decode": [Function],
-              "encode": [Function],
-              "is": [Function],
-              "name": "string",
-              "validate": [Function],
-            },
-            "to": StringType {
-              "_tag": "StringType",
-              "decode": [Function],
-              "encode": [Function],
-              "is": [Function],
-              "name": "string",
-              "validate": [Function],
-            },
-          },
-          "validate": [Function],
-        },
-        PartialType {
-          "_tag": "PartialType",
-          "decode": [Function],
-          "encode": [Function],
-          "is": [Function],
-          "name": "Partial<{ readAt: number }>",
-          "props": Object {
-            "readAt": NumberType {
-              "_tag": "NumberType",
-              "decode": [Function],
-              "encode": [Function],
-              "is": [Function],
-              "name": "number",
-              "validate": [Function],
-            },
-          },
-          "validate": [Function],
-        },
-        PartialType {
-          "_tag": "PartialType",
-          "decode": [Function],
-          "encode": [Function],
-          "is": [Function],
-          "name": "Partial<{ editedAt: number }>",
-          "props": Object {
-            "editedAt": NumberType {
-              "_tag": "NumberType",
-              "decode": [Function],
-              "encode": [Function],
-              "is": [Function],
-              "name": "number",
-              "validate": [Function],
-            },
-          },
-          "validate": [Function],
-        },
-        PartialType {
-          "_tag": "PartialType",
-          "decode": [Function],
-          "encode": [Function],
-          "is": [Function],
-          "name": "Partial<{ editingAt: number }>",
-          "props": Object {
-            "editingAt": NumberType {
-              "_tag": "NumberType",
-              "decode": [Function],
-              "encode": [Function],
-              "is": [Function],
-              "name": "number",
-              "validate": [Function],
-            },
-          },
-          "validate": [Function],
-        },
-      ],
-      "validate": [Function],
-    },
-    InterfaceType {
-      "_tag": "InterfaceType",
-      "decode": [Function],
-      "encode": [Function],
-      "is": [Function],
-      "name": "{ payload: { url: string, name: string, size: number, type: string } }",
-      "props": Object {
-        "payload": InterfaceType {
-          "_tag": "InterfaceType",
-          "decode": [Function],
-          "encode": [Function],
-          "is": [Function],
-          "name": "{ url: string, name: string, size: number, type: string }",
-          "props": Object {
-            "name": StringType {
-              "_tag": "StringType",
-              "decode": [Function],
-              "encode": [Function],
-              "is": [Function],
-              "name": "string",
-              "validate": [Function],
-            },
-            "size": NumberType {
-              "_tag": "NumberType",
-              "decode": [Function],
-              "encode": [Function],
-              "is": [Function],
-              "name": "number",
-              "validate": [Function],
-            },
-            "type": StringType {
-              "_tag": "StringType",
-              "decode": [Function],
-              "encode": [Function],
-              "is": [Function],
-              "name": "string",
-              "validate": [Function],
-            },
-            "url": StringType {
-              "_tag": "StringType",
-              "decode": [Function],
-              "encode": [Function],
-              "is": [Function],
-              "name": "string",
-              "validate": [Function],
-            },
-          },
-          "validate": [Function],
-        },
-      },
-      "validate": [Function],
-    },
-    InterfaceType {
-      "_tag": "InterfaceType",
-      "decode": [Function],
-      "encode": [Function],
-      "is": [Function],
-      "name": "{ type: \\"image\\" }",
-      "props": Object {
-        "type": LiteralType {
-          "_tag": "LiteralType",
-          "decode": [Function],
-          "encode": [Function],
-          "is": [Function],
-          "name": "\\"image\\"",
-          "validate": [Function],
-          "value": "image",
-        },
-      },
-      "validate": [Function],
-    },
-  ],
-  "validate": [Function],
-}
-`;
-
 exports[`check all constants mediaMessage to return correctly 1`] = `
 IntersectionType {
   "_tag": "IntersectionType",
@@ -803,14 +621,14 @@ UnionType {
   "decode": [Function],
   "encode": [Function],
   "is": [Function],
-  "name": "(((({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { repliedTo: string, replyType: \\"text\\", type: \\"reply\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string } } & { repliedTo: string, replyType: \\"file\\", type: \\"reply\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string } } & { repliedTo: string, replyType: \\"image\\", type: \\"reply\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { repliedTo: string, replyType: \\"media\\", type: \\"reply\\" })) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string, reactedTo: string, type: \\"reaction\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string } } & { type: \\"file\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string } } & { type: \\"image\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { type: \\"text\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { type: \\"media\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string, pack: string } & { type: \\"glyph\\" }))",
+  "name": "(((({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { repliedTo: string, replyType: \\"text\\", type: \\"reply\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string, id: string } } & { repliedTo: string, replyType: \\"file\\", type: \\"reply\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { repliedTo: string, replyType: \\"media\\", type: \\"reply\\" })) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string, reactedTo: string, type: \\"reaction\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string, id: string } } & { type: \\"file\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { type: \\"text\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { type: \\"media\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string, pack: string } & { type: \\"glyph\\" }))",
   "types": Array [
     TaggedUnionType {
       "_tag": "UnionType",
       "decode": [Function],
       "encode": [Function],
       "is": [Function],
-      "name": "((({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { repliedTo: string, replyType: \\"text\\", type: \\"reply\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string } } & { repliedTo: string, replyType: \\"file\\", type: \\"reply\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string } } & { repliedTo: string, replyType: \\"image\\", type: \\"reply\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { repliedTo: string, replyType: \\"media\\", type: \\"reply\\" }))",
+      "name": "((({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { repliedTo: string, replyType: \\"text\\", type: \\"reply\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string, id: string } } & { repliedTo: string, replyType: \\"file\\", type: \\"reply\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { repliedTo: string, replyType: \\"media\\", type: \\"reply\\" }))",
       "tag": "replyType",
       "types": Array [
         IntersectionType {
@@ -988,7 +806,7 @@ UnionType {
           "decode": [Function],
           "encode": [Function],
           "is": [Function],
-          "name": "(({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string } } & { repliedTo: string, replyType: \\"file\\", type: \\"reply\\" })",
+          "name": "(({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string, id: string } } & { repliedTo: string, replyType: \\"file\\", type: \\"reply\\" })",
           "types": Array [
             IntersectionType {
               "_tag": "IntersectionType",
@@ -1101,15 +919,23 @@ UnionType {
               "decode": [Function],
               "encode": [Function],
               "is": [Function],
-              "name": "{ payload: { url: string, name: string, size: number, type: string } }",
+              "name": "{ payload: { url: string, name: string, size: number, type: string, id: string } }",
               "props": Object {
                 "payload": InterfaceType {
                   "_tag": "InterfaceType",
                   "decode": [Function],
                   "encode": [Function],
                   "is": [Function],
-                  "name": "{ url: string, name: string, size: number, type: string }",
+                  "name": "{ url: string, name: string, size: number, type: string, id: string }",
                   "props": Object {
+                    "id": StringType {
+                      "_tag": "StringType",
+                      "decode": [Function],
+                      "encode": [Function],
+                      "is": [Function],
+                      "name": "string",
+                      "validate": [Function],
+                    },
                     "name": StringType {
                       "_tag": "StringType",
                       "decode": [Function],
@@ -1192,7 +1018,7 @@ UnionType {
           "decode": [Function],
           "encode": [Function],
           "is": [Function],
-          "name": "(({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string } } & { repliedTo: string, replyType: \\"image\\", type: \\"reply\\" })",
+          "name": "(({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { repliedTo: string, replyType: \\"media\\", type: \\"reply\\" })",
           "types": Array [
             IntersectionType {
               "_tag": "IntersectionType",
@@ -1305,48 +1131,14 @@ UnionType {
               "decode": [Function],
               "encode": [Function],
               "is": [Function],
-              "name": "{ payload: { url: string, name: string, size: number, type: string } }",
+              "name": "{ payload: string }",
               "props": Object {
-                "payload": InterfaceType {
-                  "_tag": "InterfaceType",
+                "payload": StringType {
+                  "_tag": "StringType",
                   "decode": [Function],
                   "encode": [Function],
                   "is": [Function],
-                  "name": "{ url: string, name: string, size: number, type: string }",
-                  "props": Object {
-                    "name": StringType {
-                      "_tag": "StringType",
-                      "decode": [Function],
-                      "encode": [Function],
-                      "is": [Function],
-                      "name": "string",
-                      "validate": [Function],
-                    },
-                    "size": NumberType {
-                      "_tag": "NumberType",
-                      "decode": [Function],
-                      "encode": [Function],
-                      "is": [Function],
-                      "name": "number",
-                      "validate": [Function],
-                    },
-                    "type": StringType {
-                      "_tag": "StringType",
-                      "decode": [Function],
-                      "encode": [Function],
-                      "is": [Function],
-                      "name": "string",
-                      "validate": [Function],
-                    },
-                    "url": StringType {
-                      "_tag": "StringType",
-                      "decode": [Function],
-                      "encode": [Function],
-                      "is": [Function],
-                      "name": "string",
-                      "validate": [Function],
-                    },
-                  },
+                  "name": "string",
                   "validate": [Function],
                 },
               },
@@ -1357,7 +1149,7 @@ UnionType {
               "decode": [Function],
               "encode": [Function],
               "is": [Function],
-              "name": "{ repliedTo: string, replyType: \\"image\\", type: \\"reply\\" }",
+              "name": "{ repliedTo: string, replyType: \\"media\\", type: \\"reply\\" }",
               "props": Object {
                 "repliedTo": StringType {
                   "_tag": "StringType",
@@ -1372,9 +1164,9 @@ UnionType {
                   "decode": [Function],
                   "encode": [Function],
                   "is": [Function],
-                  "name": "\\"image\\"",
+                  "name": "\\"media\\"",
                   "validate": [Function],
-                  "value": "image",
+                  "value": "media",
                 },
                 "type": LiteralType {
                   "_tag": "LiteralType",
@@ -1391,343 +1183,22 @@ UnionType {
           ],
           "validate": [Function],
         },
+      ],
+      "validate": [Function],
+    },
+    IntersectionType {
+      "_tag": "IntersectionType",
+      "decode": [Function],
+      "encode": [Function],
+      "is": [Function],
+      "name": "(({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string, reactedTo: string, type: \\"reaction\\" })",
+      "types": Array [
         IntersectionType {
           "_tag": "IntersectionType",
           "decode": [Function],
           "encode": [Function],
           "is": [Function],
-          "name": "(({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { repliedTo: string, replyType: \\"media\\", type: \\"reply\\" })",
-          "types": Array [
-            IntersectionType {
-              "_tag": "IntersectionType",
-              "decode": [Function],
-              "encode": [Function],
-              "is": [Function],
-              "name": "({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>)",
-              "types": Array [
-                InterfaceType {
-                  "_tag": "InterfaceType",
-                  "decode": [Function],
-                  "encode": [Function],
-                  "is": [Function],
-                  "name": "{ id: string, at: number, from: string, to: string }",
-                  "props": Object {
-                    "at": NumberType {
-                      "_tag": "NumberType",
-                      "decode": [Function],
-                      "encode": [Function],
-                      "is": [Function],
-                      "name": "number",
-                      "validate": [Function],
-                    },
-                    "from": StringType {
-                      "_tag": "StringType",
-                      "decode": [Function],
-                      "encode": [Function],
-                      "is": [Function],
-                      "name": "string",
-                      "validate": [Function],
-                    },
-                    "id": StringType {
-                      "_tag": "StringType",
-                      "decode": [Function],
-                      "encode": [Function],
-                      "is": [Function],
-                      "name": "string",
-                      "validate": [Function],
-                    },
-                    "to": StringType {
-                      "_tag": "StringType",
-                      "decode": [Function],
-                      "encode": [Function],
-                      "is": [Function],
-                      "name": "string",
-                      "validate": [Function],
-                    },
-                  },
-                  "validate": [Function],
-                },
-                PartialType {
-                  "_tag": "PartialType",
-                  "decode": [Function],
-                  "encode": [Function],
-                  "is": [Function],
-                  "name": "Partial<{ readAt: number }>",
-                  "props": Object {
-                    "readAt": NumberType {
-                      "_tag": "NumberType",
-                      "decode": [Function],
-                      "encode": [Function],
-                      "is": [Function],
-                      "name": "number",
-                      "validate": [Function],
-                    },
-                  },
-                  "validate": [Function],
-                },
-                PartialType {
-                  "_tag": "PartialType",
-                  "decode": [Function],
-                  "encode": [Function],
-                  "is": [Function],
-                  "name": "Partial<{ editedAt: number }>",
-                  "props": Object {
-                    "editedAt": NumberType {
-                      "_tag": "NumberType",
-                      "decode": [Function],
-                      "encode": [Function],
-                      "is": [Function],
-                      "name": "number",
-                      "validate": [Function],
-                    },
-                  },
-                  "validate": [Function],
-                },
-                PartialType {
-                  "_tag": "PartialType",
-                  "decode": [Function],
-                  "encode": [Function],
-                  "is": [Function],
-                  "name": "Partial<{ editingAt: number }>",
-                  "props": Object {
-                    "editingAt": NumberType {
-                      "_tag": "NumberType",
-                      "decode": [Function],
-                      "encode": [Function],
-                      "is": [Function],
-                      "name": "number",
-                      "validate": [Function],
-                    },
-                  },
-                  "validate": [Function],
-                },
-              ],
-              "validate": [Function],
-            },
-            InterfaceType {
-              "_tag": "InterfaceType",
-              "decode": [Function],
-              "encode": [Function],
-              "is": [Function],
-              "name": "{ payload: string }",
-              "props": Object {
-                "payload": StringType {
-                  "_tag": "StringType",
-                  "decode": [Function],
-                  "encode": [Function],
-                  "is": [Function],
-                  "name": "string",
-                  "validate": [Function],
-                },
-              },
-              "validate": [Function],
-            },
-            InterfaceType {
-              "_tag": "InterfaceType",
-              "decode": [Function],
-              "encode": [Function],
-              "is": [Function],
-              "name": "{ repliedTo: string, replyType: \\"media\\", type: \\"reply\\" }",
-              "props": Object {
-                "repliedTo": StringType {
-                  "_tag": "StringType",
-                  "decode": [Function],
-                  "encode": [Function],
-                  "is": [Function],
-                  "name": "string",
-                  "validate": [Function],
-                },
-                "replyType": LiteralType {
-                  "_tag": "LiteralType",
-                  "decode": [Function],
-                  "encode": [Function],
-                  "is": [Function],
-                  "name": "\\"media\\"",
-                  "validate": [Function],
-                  "value": "media",
-                },
-                "type": LiteralType {
-                  "_tag": "LiteralType",
-                  "decode": [Function],
-                  "encode": [Function],
-                  "is": [Function],
-                  "name": "\\"reply\\"",
-                  "validate": [Function],
-                  "value": "reply",
-                },
-              },
-              "validate": [Function],
-            },
-          ],
-          "validate": [Function],
-        },
-      ],
-      "validate": [Function],
-    },
-    IntersectionType {
-      "_tag": "IntersectionType",
-      "decode": [Function],
-      "encode": [Function],
-      "is": [Function],
-      "name": "(({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string, reactedTo: string, type: \\"reaction\\" })",
-      "types": Array [
-        IntersectionType {
-          "_tag": "IntersectionType",
-          "decode": [Function],
-          "encode": [Function],
-          "is": [Function],
-          "name": "({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>)",
-          "types": Array [
-            InterfaceType {
-              "_tag": "InterfaceType",
-              "decode": [Function],
-              "encode": [Function],
-              "is": [Function],
-              "name": "{ id: string, at: number, from: string, to: string }",
-              "props": Object {
-                "at": NumberType {
-                  "_tag": "NumberType",
-                  "decode": [Function],
-                  "encode": [Function],
-                  "is": [Function],
-                  "name": "number",
-                  "validate": [Function],
-                },
-                "from": StringType {
-                  "_tag": "StringType",
-                  "decode": [Function],
-                  "encode": [Function],
-                  "is": [Function],
-                  "name": "string",
-                  "validate": [Function],
-                },
-                "id": StringType {
-                  "_tag": "StringType",
-                  "decode": [Function],
-                  "encode": [Function],
-                  "is": [Function],
-                  "name": "string",
-                  "validate": [Function],
-                },
-                "to": StringType {
-                  "_tag": "StringType",
-                  "decode": [Function],
-                  "encode": [Function],
-                  "is": [Function],
-                  "name": "string",
-                  "validate": [Function],
-                },
-              },
-              "validate": [Function],
-            },
-            PartialType {
-              "_tag": "PartialType",
-              "decode": [Function],
-              "encode": [Function],
-              "is": [Function],
-              "name": "Partial<{ readAt: number }>",
-              "props": Object {
-                "readAt": NumberType {
-                  "_tag": "NumberType",
-                  "decode": [Function],
-                  "encode": [Function],
-                  "is": [Function],
-                  "name": "number",
-                  "validate": [Function],
-                },
-              },
-              "validate": [Function],
-            },
-            PartialType {
-              "_tag": "PartialType",
-              "decode": [Function],
-              "encode": [Function],
-              "is": [Function],
-              "name": "Partial<{ editedAt: number }>",
-              "props": Object {
-                "editedAt": NumberType {
-                  "_tag": "NumberType",
-                  "decode": [Function],
-                  "encode": [Function],
-                  "is": [Function],
-                  "name": "number",
-                  "validate": [Function],
-                },
-              },
-              "validate": [Function],
-            },
-            PartialType {
-              "_tag": "PartialType",
-              "decode": [Function],
-              "encode": [Function],
-              "is": [Function],
-              "name": "Partial<{ editingAt: number }>",
-              "props": Object {
-                "editingAt": NumberType {
-                  "_tag": "NumberType",
-                  "decode": [Function],
-                  "encode": [Function],
-                  "is": [Function],
-                  "name": "number",
-                  "validate": [Function],
-                },
-              },
-              "validate": [Function],
-            },
-          ],
-          "validate": [Function],
-        },
-        InterfaceType {
-          "_tag": "InterfaceType",
-          "decode": [Function],
-          "encode": [Function],
-          "is": [Function],
-          "name": "{ payload: string, reactedTo: string, type: \\"reaction\\" }",
-          "props": Object {
-            "payload": StringType {
-              "_tag": "StringType",
-              "decode": [Function],
-              "encode": [Function],
-              "is": [Function],
-              "name": "string",
-              "validate": [Function],
-            },
-            "reactedTo": StringType {
-              "_tag": "StringType",
-              "decode": [Function],
-              "encode": [Function],
-              "is": [Function],
-              "name": "string",
-              "validate": [Function],
-            },
-            "type": LiteralType {
-              "_tag": "LiteralType",
-              "decode": [Function],
-              "encode": [Function],
-              "is": [Function],
-              "name": "\\"reaction\\"",
-              "validate": [Function],
-              "value": "reaction",
-            },
-          },
-          "validate": [Function],
-        },
-      ],
-      "validate": [Function],
-    },
-    IntersectionType {
-      "_tag": "IntersectionType",
-      "decode": [Function],
-      "encode": [Function],
-      "is": [Function],
-      "name": "(({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string } } & { type: \\"file\\" })",
-      "types": Array [
-        IntersectionType {
-          "_tag": "IntersectionType",
-          "decode": [Function],
-          "encode": [Function],
-          "is": [Function],
-          "name": "({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>)",
+          "name": "({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>)",
           "types": Array [
             InterfaceType {
               "_tag": "InterfaceType",
@@ -1796,61 +1267,7 @@ UnionType {
               "is": [Function],
               "name": "Partial<{ editedAt: number }>",
               "props": Object {
-                "editedAt": NumberType {
-                  "_tag": "NumberType",
-                  "decode": [Function],
-                  "encode": [Function],
-                  "is": [Function],
-                  "name": "number",
-                  "validate": [Function],
-                },
-              },
-              "validate": [Function],
-            },
-            PartialType {
-              "_tag": "PartialType",
-              "decode": [Function],
-              "encode": [Function],
-              "is": [Function],
-              "name": "Partial<{ editingAt: number }>",
-              "props": Object {
-                "editingAt": NumberType {
-                  "_tag": "NumberType",
-                  "decode": [Function],
-                  "encode": [Function],
-                  "is": [Function],
-                  "name": "number",
-                  "validate": [Function],
-                },
-              },
-              "validate": [Function],
-            },
-          ],
-          "validate": [Function],
-        },
-        InterfaceType {
-          "_tag": "InterfaceType",
-          "decode": [Function],
-          "encode": [Function],
-          "is": [Function],
-          "name": "{ payload: { url: string, name: string, size: number, type: string } }",
-          "props": Object {
-            "payload": InterfaceType {
-              "_tag": "InterfaceType",
-              "decode": [Function],
-              "encode": [Function],
-              "is": [Function],
-              "name": "{ url: string, name: string, size: number, type: string }",
-              "props": Object {
-                "name": StringType {
-                  "_tag": "StringType",
-                  "decode": [Function],
-                  "encode": [Function],
-                  "is": [Function],
-                  "name": "string",
-                  "validate": [Function],
-                },
-                "size": NumberType {
+                "editedAt": NumberType {
                   "_tag": "NumberType",
                   "decode": [Function],
                   "encode": [Function],
@@ -1858,26 +1275,28 @@ UnionType {
                   "name": "number",
                   "validate": [Function],
                 },
-                "type": StringType {
-                  "_tag": "StringType",
-                  "decode": [Function],
-                  "encode": [Function],
-                  "is": [Function],
-                  "name": "string",
-                  "validate": [Function],
-                },
-                "url": StringType {
-                  "_tag": "StringType",
+              },
+              "validate": [Function],
+            },
+            PartialType {
+              "_tag": "PartialType",
+              "decode": [Function],
+              "encode": [Function],
+              "is": [Function],
+              "name": "Partial<{ editingAt: number }>",
+              "props": Object {
+                "editingAt": NumberType {
+                  "_tag": "NumberType",
                   "decode": [Function],
                   "encode": [Function],
                   "is": [Function],
-                  "name": "string",
+                  "name": "number",
                   "validate": [Function],
                 },
               },
               "validate": [Function],
             },
-          },
+          ],
           "validate": [Function],
         },
         InterfaceType {
@@ -1885,16 +1304,32 @@ UnionType {
           "decode": [Function],
           "encode": [Function],
           "is": [Function],
-          "name": "{ type: \\"file\\" }",
+          "name": "{ payload: string, reactedTo: string, type: \\"reaction\\" }",
           "props": Object {
+            "payload": StringType {
+              "_tag": "StringType",
+              "decode": [Function],
+              "encode": [Function],
+              "is": [Function],
+              "name": "string",
+              "validate": [Function],
+            },
+            "reactedTo": StringType {
+              "_tag": "StringType",
+              "decode": [Function],
+              "encode": [Function],
+              "is": [Function],
+              "name": "string",
+              "validate": [Function],
+            },
             "type": LiteralType {
               "_tag": "LiteralType",
               "decode": [Function],
               "encode": [Function],
               "is": [Function],
-              "name": "\\"file\\"",
+              "name": "\\"reaction\\"",
               "validate": [Function],
-              "value": "file",
+              "value": "reaction",
             },
           },
           "validate": [Function],
@@ -1907,7 +1342,7 @@ UnionType {
       "decode": [Function],
       "encode": [Function],
       "is": [Function],
-      "name": "(({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string } } & { type: \\"image\\" })",
+      "name": "(({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string, id: string } } & { type: \\"file\\" })",
       "types": Array [
         IntersectionType {
           "_tag": "IntersectionType",
@@ -2020,15 +1455,23 @@ UnionType {
           "decode": [Function],
           "encode": [Function],
           "is": [Function],
-          "name": "{ payload: { url: string, name: string, size: number, type: string } }",
+          "name": "{ payload: { url: string, name: string, size: number, type: string, id: string } }",
           "props": Object {
             "payload": InterfaceType {
               "_tag": "InterfaceType",
               "decode": [Function],
               "encode": [Function],
               "is": [Function],
-              "name": "{ url: string, name: string, size: number, type: string }",
+              "name": "{ url: string, name: string, size: number, type: string, id: string }",
               "props": Object {
+                "id": StringType {
+                  "_tag": "StringType",
+                  "decode": [Function],
+                  "encode": [Function],
+                  "is": [Function],
+                  "name": "string",
+                  "validate": [Function],
+                },
                 "name": StringType {
                   "_tag": "StringType",
                   "decode": [Function],
@@ -2072,16 +1515,16 @@ UnionType {
           "decode": [Function],
           "encode": [Function],
           "is": [Function],
-          "name": "{ type: \\"image\\" }",
+          "name": "{ type: \\"file\\" }",
           "props": Object {
             "type": LiteralType {
               "_tag": "LiteralType",
               "decode": [Function],
               "encode": [Function],
               "is": [Function],
-              "name": "\\"image\\"",
+              "name": "\\"file\\"",
               "validate": [Function],
-              "value": "image",
+              "value": "file",
             },
           },
           "validate": [Function],
@@ -2910,7 +2353,7 @@ TaggedUnionType {
   "decode": [Function],
   "encode": [Function],
   "is": [Function],
-  "name": "((({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { repliedTo: string, replyType: \\"text\\", type: \\"reply\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string } } & { repliedTo: string, replyType: \\"file\\", type: \\"reply\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string } } & { repliedTo: string, replyType: \\"image\\", type: \\"reply\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { repliedTo: string, replyType: \\"media\\", type: \\"reply\\" }))",
+  "name": "((({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { repliedTo: string, replyType: \\"text\\", type: \\"reply\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string, id: string } } & { repliedTo: string, replyType: \\"file\\", type: \\"reply\\" }) | (({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: string } & { repliedTo: string, replyType: \\"media\\", type: \\"reply\\" }))",
   "tag": "replyType",
   "types": Array [
     IntersectionType {
@@ -3088,7 +2531,7 @@ TaggedUnionType {
       "decode": [Function],
       "encode": [Function],
       "is": [Function],
-      "name": "(({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string } } & { repliedTo: string, replyType: \\"file\\", type: \\"reply\\" })",
+      "name": "(({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string, id: string } } & { repliedTo: string, replyType: \\"file\\", type: \\"reply\\" })",
       "types": Array [
         IntersectionType {
           "_tag": "IntersectionType",
@@ -3201,129 +2644,15 @@ TaggedUnionType {
           "decode": [Function],
           "encode": [Function],
           "is": [Function],
-          "name": "{ payload: { url: string, name: string, size: number, type: string } }",
+          "name": "{ payload: { url: string, name: string, size: number, type: string, id: string } }",
           "props": Object {
             "payload": InterfaceType {
               "_tag": "InterfaceType",
               "decode": [Function],
               "encode": [Function],
               "is": [Function],
-              "name": "{ url: string, name: string, size: number, type: string }",
-              "props": Object {
-                "name": StringType {
-                  "_tag": "StringType",
-                  "decode": [Function],
-                  "encode": [Function],
-                  "is": [Function],
-                  "name": "string",
-                  "validate": [Function],
-                },
-                "size": NumberType {
-                  "_tag": "NumberType",
-                  "decode": [Function],
-                  "encode": [Function],
-                  "is": [Function],
-                  "name": "number",
-                  "validate": [Function],
-                },
-                "type": StringType {
-                  "_tag": "StringType",
-                  "decode": [Function],
-                  "encode": [Function],
-                  "is": [Function],
-                  "name": "string",
-                  "validate": [Function],
-                },
-                "url": StringType {
-                  "_tag": "StringType",
-                  "decode": [Function],
-                  "encode": [Function],
-                  "is": [Function],
-                  "name": "string",
-                  "validate": [Function],
-                },
-              },
-              "validate": [Function],
-            },
-          },
-          "validate": [Function],
-        },
-        InterfaceType {
-          "_tag": "InterfaceType",
-          "decode": [Function],
-          "encode": [Function],
-          "is": [Function],
-          "name": "{ repliedTo: string, replyType: \\"file\\", type: \\"reply\\" }",
-          "props": Object {
-            "repliedTo": StringType {
-              "_tag": "StringType",
-              "decode": [Function],
-              "encode": [Function],
-              "is": [Function],
-              "name": "string",
-              "validate": [Function],
-            },
-            "replyType": LiteralType {
-              "_tag": "LiteralType",
-              "decode": [Function],
-              "encode": [Function],
-              "is": [Function],
-              "name": "\\"file\\"",
-              "validate": [Function],
-              "value": "file",
-            },
-            "type": LiteralType {
-              "_tag": "LiteralType",
-              "decode": [Function],
-              "encode": [Function],
-              "is": [Function],
-              "name": "\\"reply\\"",
-              "validate": [Function],
-              "value": "reply",
-            },
-          },
-          "validate": [Function],
-        },
-      ],
-      "validate": [Function],
-    },
-    IntersectionType {
-      "_tag": "IntersectionType",
-      "decode": [Function],
-      "encode": [Function],
-      "is": [Function],
-      "name": "(({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>) & { payload: { url: string, name: string, size: number, type: string } } & { repliedTo: string, replyType: \\"image\\", type: \\"reply\\" })",
-      "types": Array [
-        IntersectionType {
-          "_tag": "IntersectionType",
-          "decode": [Function],
-          "encode": [Function],
-          "is": [Function],
-          "name": "({ id: string, at: number, from: string, to: string } & Partial<{ readAt: number }> & Partial<{ editedAt: number }> & Partial<{ editingAt: number }>)",
-          "types": Array [
-            InterfaceType {
-              "_tag": "InterfaceType",
-              "decode": [Function],
-              "encode": [Function],
-              "is": [Function],
-              "name": "{ id: string, at: number, from: string, to: string }",
+              "name": "{ url: string, name: string, size: number, type: string, id: string }",
               "props": Object {
-                "at": NumberType {
-                  "_tag": "NumberType",
-                  "decode": [Function],
-                  "encode": [Function],
-                  "is": [Function],
-                  "name": "number",
-                  "validate": [Function],
-                },
-                "from": StringType {
-                  "_tag": "StringType",
-                  "decode": [Function],
-                  "encode": [Function],
-                  "is": [Function],
-                  "name": "string",
-                  "validate": [Function],
-                },
                 "id": StringType {
                   "_tag": "StringType",
                   "decode": [Function],
@@ -3332,88 +2661,6 @@ TaggedUnionType {
                   "name": "string",
                   "validate": [Function],
                 },
-                "to": StringType {
-                  "_tag": "StringType",
-                  "decode": [Function],
-                  "encode": [Function],
-                  "is": [Function],
-                  "name": "string",
-                  "validate": [Function],
-                },
-              },
-              "validate": [Function],
-            },
-            PartialType {
-              "_tag": "PartialType",
-              "decode": [Function],
-              "encode": [Function],
-              "is": [Function],
-              "name": "Partial<{ readAt: number }>",
-              "props": Object {
-                "readAt": NumberType {
-                  "_tag": "NumberType",
-                  "decode": [Function],
-                  "encode": [Function],
-                  "is": [Function],
-                  "name": "number",
-                  "validate": [Function],
-                },
-              },
-              "validate": [Function],
-            },
-            PartialType {
-              "_tag": "PartialType",
-              "decode": [Function],
-              "encode": [Function],
-              "is": [Function],
-              "name": "Partial<{ editedAt: number }>",
-              "props": Object {
-                "editedAt": NumberType {
-                  "_tag": "NumberType",
-                  "decode": [Function],
-                  "encode": [Function],
-                  "is": [Function],
-                  "name": "number",
-                  "validate": [Function],
-                },
-              },
-              "validate": [Function],
-            },
-            PartialType {
-              "_tag": "PartialType",
-              "decode": [Function],
-              "encode": [Function],
-              "is": [Function],
-              "name": "Partial<{ editingAt: number }>",
-              "props": Object {
-                "editingAt": NumberType {
-                  "_tag": "NumberType",
-                  "decode": [Function],
-                  "encode": [Function],
-                  "is": [Function],
-                  "name": "number",
-                  "validate": [Function],
-                },
-              },
-              "validate": [Function],
-            },
-          ],
-          "validate": [Function],
-        },
-        InterfaceType {
-          "_tag": "InterfaceType",
-          "decode": [Function],
-          "encode": [Function],
-          "is": [Function],
-          "name": "{ payload: { url: string, name: string, size: number, type: string } }",
-          "props": Object {
-            "payload": InterfaceType {
-              "_tag": "InterfaceType",
-              "decode": [Function],
-              "encode": [Function],
-              "is": [Function],
-              "name": "{ url: string, name: string, size: number, type: string }",
-              "props": Object {
                 "name": StringType {
                   "_tag": "StringType",
                   "decode": [Function],
@@ -3457,7 +2704,7 @@ TaggedUnionType {
           "decode": [Function],
           "encode": [Function],
           "is": [Function],
-          "name": "{ repliedTo: string, replyType: \\"image\\", type: \\"reply\\" }",
+          "name": "{ repliedTo: string, replyType: \\"file\\", type: \\"reply\\" }",
           "props": Object {
             "repliedTo": StringType {
               "_tag": "StringType",
@@ -3472,9 +2719,9 @@ TaggedUnionType {
               "decode": [Function],
               "encode": [Function],
               "is": [Function],
-              "name": "\\"image\\"",
+              "name": "\\"file\\"",
               "validate": [Function],
-              "value": "image",
+              "value": "file",
             },
             "type": LiteralType {
               "_tag": "LiteralType",
diff --git a/libraries/Textile/encoders.test.ts b/libraries/Textile/encoders.test.ts
index 118be60b43..2bbe5f41d5 100644
--- a/libraries/Textile/encoders.test.ts
+++ b/libraries/Textile/encoders.test.ts
@@ -3,7 +3,6 @@ import {
   exportedForTesting,
   fileMessage,
   glyphMessage,
-  imageMessage,
   mediaMessage,
   messageEncoder,
   messageFromThread,
@@ -29,9 +28,6 @@ describe('check all constants', () => {
   it('fileMessage to return correctly', () => {
     expect(fileMessage).toMatchSnapshot()
   })
-  it('imageMessage to return correctly', () => {
-    expect(imageMessage).toMatchSnapshot()
-  })
   it('textMessage to return correctly', () => {
     expect(textMessage).toMatchSnapshot()
   })
diff --git a/libraries/Textile/encoders.ts b/libraries/Textile/encoders.ts
index 313791c700..1c4ae0e532 100644
--- a/libraries/Textile/encoders.ts
+++ b/libraries/Textile/encoders.ts
@@ -77,15 +77,7 @@ const fileMessagePayload = t.type({
     name: t.string,
     size: t.number,
     type: t.string,
-  }),
-})
-
-const imageMessagePayload = t.type({
-  payload: t.type({
-    url: t.string,
-    name: t.string,
-    size: t.number,
-    type: t.string,
+    id: t.string,
   }),
 })
 
@@ -97,14 +89,6 @@ export const fileMessage = t.intersection([
   }),
 ])
 
-export const imageMessage = t.intersection([
-  baseMessage,
-  imageMessagePayload,
-  t.type({
-    type: t.literal('image'),
-  }),
-])
-
 const textMessagePayload = t.type({
   payload: t.string,
 })
@@ -161,15 +145,6 @@ export const replyMessage = t.union([
       type: t.literal('reply'),
     }),
   ]),
-  t.intersection([
-    baseMessage,
-    imageMessagePayload,
-    t.type({
-      repliedTo: t.string,
-      replyType: t.literal('image'),
-      type: t.literal('reply'),
-    }),
-  ]),
   t.intersection([
     baseMessage,
     mediaMessagePayload,
@@ -185,7 +160,6 @@ export const messageEncoder = t.union([
   replyMessage,
   reactionMessage,
   fileMessage,
-  imageMessage,
   textMessage,
   mediaMessage,
   glyphMessage,
diff --git a/pages/files/browse/index.vue b/pages/files/browse/index.vue
index aa006dfc14..e98da49355 100644
--- a/pages/files/browse/index.vue
+++ b/pages/files/browse/index.vue
@@ -92,7 +92,9 @@ export default Vue.extend({
         'ui/setFilesUploadStatus',
         this.$t('pages.files.status.index'),
       )
-      await this.$TextileManager.bucket?.updateIndex(this.$FileSystem.export)
+      await this.$TextileManager.privateBucket?.updateIndex(
+        this.$FileSystem.export,
+      )
       item.liked
         ? this.$toast.show(this.$t('pages.files.add_favorite') as string)
         : this.$toast.show(this.$t('pages.files.remove_favorite') as string)
@@ -117,7 +119,9 @@ export default Vue.extend({
         'ui/setFilesUploadStatus',
         this.$t('pages.files.status.index'),
       )
-      await this.$TextileManager.bucket?.updateIndex(this.$FileSystem.export)
+      await this.$TextileManager.privateBucket?.updateIndex(
+        this.$FileSystem.export,
+      )
       this.$store.commit('ui/setFilesUploadStatus', '')
 
       this.forceRender()
diff --git a/plugins/local/classLoader.ts b/plugins/local/classLoader.ts
index 25c005ef5f..f8c214e9ad 100644
--- a/plugins/local/classLoader.ts
+++ b/plugins/local/classLoader.ts
@@ -14,7 +14,6 @@ import TextileManager from '~/libraries/Textile/TextileManager'
 import { TextileFileSystem } from '~/libraries/Files/TextileFileSystem'
 // Utils
 import Hounddog from '~/utilities/Hounddog'
-import BucketManager from '~/libraries/Textile/BucketManager'
 import Logger from '~/utilities/Logger'
 
 declare module 'vue/types/vue' {
@@ -26,7 +25,6 @@ declare module 'vue/types/vue' {
     $Security: Security
     $typedStore: RootStore
     $TextileManager: TextileManager
-    $BucketManager: BucketManager
     $Hounddog: Hounddog
     $Logger: Logger
     $FileSystem: TextileFileSystem
@@ -42,7 +40,6 @@ declare module '@nuxt/types' {
     $Security: Security
     $typedStore: RootStore
     $TextileManager: TextileManager
-    $BucketManager: BucketManager
     $Hounddog: Hounddog
     $Logger: Logger
     $FileSystem: TextileFileSystem
diff --git a/store/accounts/actions.ts b/store/accounts/actions.ts
index dd9849bcf8..05d4604417 100644
--- a/store/accounts/actions.ts
+++ b/store/accounts/actions.ts
@@ -13,6 +13,7 @@ import UsersProgram from '~/libraries/Solana/UsersProgram/UsersProgram'
 import TextileManager from '~/libraries/Textile/TextileManager'
 import { ActionsArguments } from '~/types/store/store'
 import { Peer2Peer } from '~/libraries/WebRTC/Libp2p'
+import { Config } from '~/config'
 
 export default {
   /**
@@ -405,13 +406,13 @@ async function uploadPicture(image: string) {
     })
 
   const $TextileManager: TextileManager = Vue.prototype.$TextileManager
-  $TextileManager.bucketManager?.getBucket()
-  const result = await $TextileManager.bucketManager?.pushFile(
+  const path = await $TextileManager.sharedBucket?.pushFile(
     imageFile,
     imageFile.name,
+    () => {},
   )
 
-  return result?.path.root.toString() ?? ''
+  return Config.textile.browser + path
 }
 
 export const exportForTesting = {
diff --git a/store/textile/actions.ts b/store/textile/actions.ts
index 698bd738ca..b5a518a3fd 100644
--- a/store/textile/actions.ts
+++ b/store/textile/actions.ts
@@ -1,4 +1,5 @@
 import Vue from 'vue'
+import { v4 as uuidv4 } from 'uuid'
 import { TextileState, TextileError } from './types'
 import { MessageRouteEnum, PropCommonEnum } from '~/libraries/Enums/enums'
 import { Config } from '~/config'
@@ -59,7 +60,7 @@ export default {
 
     commit('accounts/updateTextilePubkey', textilePublicKey, { root: true })
 
-    const fsExport = $TextileManager.bucket?.index
+    const fsExport = $TextileManager.privateBucket?.index
 
     if (fsExport) {
       const $FileSystem: FilSystem = Vue.prototype.$FileSystem
@@ -326,21 +327,20 @@ export default {
     commit('setMessageLoading', { loading: true })
     document.body.style.cursor = PropCommonEnum.WAIT
     const $TextileManager: TextileManager = Vue.prototype.$TextileManager
-    const path = `/${file.file.name}`
-    $TextileManager.bucketManager?.getBucket()
-    const result = await $TextileManager.bucketManager?.pushFile(
+    const id = uuidv4()
+    const path = await $TextileManager.sharedBucket?.pushFile(
       file.file,
-      path,
+      id,
       (progress: number) => {
         commit('setUploadingFileProgress', {
-          progress,
+          progress: Math.floor((progress / file.file.size) * 100),
           name: file.file.name,
         })
       },
     )
     /* If already canceled */
     if (!rootState.textile.messageLoading) return
-    const fileURL = `${Config.textile.browser}${result?.root}${path}`
+    const fileURL = Config.textile.browser + path
     const friend = rootState.friends.all.find((fr) => fr.textilePubkey === to)
 
     if (!friend) {
@@ -356,6 +356,7 @@ export default {
             name: file.file.name,
             size: file.file.size,
             type: file.file.type,
+            id,
           },
           type: 'file',
         },
@@ -845,11 +846,10 @@ export default {
     document.body.style.cursor = PropCommonEnum.WAIT
     const $TextileManager: TextileManager = Vue.prototype.$TextileManager
     const group = getGroup(rootState, groupID)
-    const path = `/${file.file.name}`
-    $TextileManager.bucketManager?.getBucket()
-    const result = await $TextileManager.bucketManager?.pushFile(
+    const id = uuidv4()
+    const path = await $TextileManager.sharedBucket?.pushFile(
       file.file,
-      path,
+      id,
       (progress: number) => {
         commit('setUploadingFileProgress', {
           progress,
@@ -857,7 +857,7 @@ export default {
         })
       },
     )
-    const fileURL = `${Config.textile.browser}${result?.root}${path}`
+    const fileURL = Config.textile.browser + path
 
     const sendFileResult =
       await $TextileManager.groupChatManager?.sendMessage<'file'>(group, {
diff --git a/store/textile/mutations.test.ts b/store/textile/mutations.test.ts
index e9a0c5bcc9..bbb4139395 100644
--- a/store/textile/mutations.test.ts
+++ b/store/textile/mutations.test.ts
@@ -52,7 +52,6 @@ describe('init', () => {
           replyMessage: 'text0',
           reactionMessage: '',
           fileMessage: '',
-          imageMessage: '',
           textMessage: '',
           mediaMessage: '',
           glyphMessage: '',
@@ -61,7 +60,6 @@ describe('init', () => {
           replyMessage: 'text1',
           reactionMessage: '',
           fileMessage: '',
-          imageMessage: '',
           textMessage: '',
           mediaMessage: '',
           glyphMessage: '',
diff --git a/store/ui/mutations.ts b/store/ui/mutations.ts
index 383768fdcb..c80785df93 100644
--- a/store/ui/mutations.ts
+++ b/store/ui/mutations.ts
@@ -11,9 +11,10 @@ import {
 } from './types'
 import { MessageGroup } from '~/types/messaging'
 import { Channel } from '~/types/ui/server'
-import { ImageMessage } from '~/types/textile/mailbox'
+import { FileMessage } from '~/types/textile/mailbox'
 import { Alert, AlertState } from '~/libraries/ui/Alerts'
 import { Item } from '~/libraries/Files/abstracts/Item.abstract'
+import { Fil } from '~/libraries/Files/Fil'
 
 export default {
   togglePinned(state: UIState, visible: boolean) {
@@ -55,7 +56,7 @@ export default {
   setFilePreview(state: UIState, file: Fil) {
     state.filePreview = file
   },
-  setChatImageOverlay(state: UIState, image: ImageMessage | undefined) {
+  setChatImageOverlay(state: UIState, image: FileMessage | undefined) {
     state.chatImageOverlay = image
   },
   toggleEnhancers(state: UIState, options: EnhancerInfo) {
diff --git a/store/ui/types.ts b/store/ui/types.ts
index 851c7083d4..5cb5c4ac53 100644
--- a/store/ui/types.ts
+++ b/store/ui/types.ts
@@ -1,5 +1,5 @@
 import { TranslateResult } from 'vue-i18n'
-import { ImageMessage } from '~/types/textile/mailbox'
+import { FileMessage } from '~/types/textile/mailbox'
 import { FileSortEnum } from '~/libraries/Enums/enums'
 import { Glyph } from '~/types/ui/glyph'
 import { Channel } from '~/types/ui/server'
@@ -212,7 +212,7 @@ export interface UIState {
   renameItem?: Item
   filePreview?: Fil
   fileDownloadList: string[]
-  chatImageOverlay?: ImageMessage
+  chatImageOverlay?: FileMessage
   fileSort: FileSort
   swiperSlideIndex: number
 }
diff --git a/types/messaging.d.ts b/types/messaging.d.ts
index b850b46b27..c5c899b766 100644
--- a/types/messaging.d.ts
+++ b/types/messaging.d.ts
@@ -1,7 +1,6 @@
 import {
   FileMessage,
   GlyphMessage,
-  ImageMessage,
   ReplyMessage,
   TextMessage,
 } from './textile/mailbox'
@@ -23,7 +22,6 @@ type ConvertToUIMessage<T> = T & {
 
 export type UIMessage =
   | ConvertToUIMessage<FileMessage>
-  | ConvertToUIMessage<ImageMessage>
   | ConvertToUIMessage<TextMessage>
   | ConvertToUIMessage<GlyphMessage>
 
diff --git a/types/textile/mailbox.ts b/types/textile/mailbox.ts
index 9a27c718c1..14cd4cc445 100644
--- a/types/textile/mailbox.ts
+++ b/types/textile/mailbox.ts
@@ -11,7 +11,6 @@ import {
   decryptedMessage,
   fileMessage,
   glyphMessage,
-  imageMessage,
   mediaMessage,
   messageEncoder,
   messageFromThread,
@@ -35,7 +34,6 @@ export type DecryptedMessage = TypeOf<typeof decryptedMessage>
 export type ReplyMessage = TypeOf<typeof replyMessage>
 export type ReactionMessage = TypeOf<typeof reactionMessage>
 export type FileMessage = TypeOf<typeof fileMessage>
-export type ImageMessage = TypeOf<typeof imageMessage>
 export type TextMessage = TypeOf<typeof textMessage>
 export type MediaMessage = TypeOf<typeof mediaMessage>
 export type GlyphMessage = TypeOf<typeof glyphMessage>
@@ -51,7 +49,6 @@ export interface MTypes {
   reply: ReplyMessage
   reaction: ReactionMessage
   file: FileMessage
-  image: ImageMessage
   text: TextMessage
   glyph: GlyphMessage
 }
@@ -69,7 +66,6 @@ export interface MessagePayloads {
   reply: Omit<ReplyMessage, 'id' | 'at' | 'from'>
   reaction: Omit<ReactionMessage, 'id' | 'at' | 'from'>
   file: Omit<FileMessage, 'id' | 'at' | 'from'>
-  image: Omit<ImageMessage, 'id' | 'at' | 'from'>
   text: Omit<TextMessage, 'id' | 'at' | 'from'>
   glyph: Omit<GlyphMessage, 'id' | 'at' | 'from'>
 }
@@ -114,11 +110,7 @@ export interface ConversationQuery {
  * Messages, replies and Reactions are stored in an object structure. Messages are indexed by
  * message id, replies and reactions are indexed by the message id they are referring to.
  */
-export type MessageTrackerValues =
-  | FileMessage
-  | TextMessage
-  | GlyphMessage
-  | ImageMessage
+export type MessageTrackerValues = FileMessage | TextMessage | GlyphMessage
 
 export type MessagesTracker = {
   [key: string]: MessageTrackerValues
diff --git a/utilities/Messaging.test.ts b/utilities/Messaging.test.ts
index 6126e3d592..2a5dfa81a0 100644
--- a/utilities/Messaging.test.ts
+++ b/utilities/Messaging.test.ts
@@ -228,7 +228,6 @@ describe('', () => {
           replyMessage: 'text1',
           reactionMessage: '',
           fileMessage: '',
-          imageMessage: '',
           textMessage: '',
           mediaMessage: '',
           glyphMessage: '',
@@ -255,7 +254,7 @@ describe('', () => {
           replyMessage: 'text1',
           reactionMessage: '',
           fileMessage: '',
-          imageMessage: '',
+
           textMessage: '',
           mediaMessage: '',
           glyphMessage: '',
@@ -265,7 +264,7 @@ describe('', () => {
           replyMessage: 'text2',
           reactionMessage: '',
           fileMessage: '',
-          imageMessage: '',
+
           textMessage: '',
           mediaMessage: '',
           glyphMessage: '',
@@ -310,7 +309,7 @@ describe('', () => {
         replyMessage: 'text1',
         reactionMessage: '',
         fileMessage: '',
-        imageMessage: '',
+
         textMessage: '',
         mediaMessage: '',
         glyphMessage: '',
@@ -336,7 +335,7 @@ describe('update message tracker', () => {
         replyMessage: 'text0',
         reactionMessage: '',
         fileMessage: '',
-        imageMessage: '',
+
         textMessage: '',
         mediaMessage: '',
         glyphMessage: '',
@@ -345,7 +344,7 @@ describe('update message tracker', () => {
         replyMessage: 'text1',
         reactionMessage: '',
         fileMessage: '',
-        imageMessage: '',
+
         textMessage: '',
         mediaMessage: '',
         glyphMessage: '',
@@ -361,7 +360,7 @@ describe('update message tracker', () => {
         replyMessage: 'text0',
         reactionMessage: '',
         fileMessage: '',
-        imageMessage: '',
+
         textMessage: '',
         mediaMessage: '',
         glyphMessage: '',
@@ -370,7 +369,7 @@ describe('update message tracker', () => {
         replyMessage: 'text1',
         reactionMessage: '',
         fileMessage: '',
-        imageMessage: '',
+
         textMessage: '',
         mediaMessage: '',
         glyphMessage: '',
@@ -386,7 +385,7 @@ describe('update message tracker', () => {
         replyMessage: 'text0',
         reactionMessage: '',
         fileMessage: '',
-        imageMessage: '',
+
         textMessage: '',
         mediaMessage: '',
         glyphMessage: '',
@@ -395,7 +394,7 @@ describe('update message tracker', () => {
         replyMessage: 'text1',
         reactionMessage: '',
         fileMessage: '',
-        imageMessage: '',
+
         textMessage: '',
         mediaMessage: '',
         glyphMessage: '',
@@ -411,7 +410,7 @@ describe('update message tracker', () => {
         replyMessage: 'text0',
         reactionMessage: '',
         fileMessage: '',
-        imageMessage: '',
+
         textMessage: '',
         mediaMessage: '',
         glyphMessage: '',
@@ -420,7 +419,7 @@ describe('update message tracker', () => {
         replyMessage: 'text1',
         reactionMessage: '',
         fileMessage: '',
-        imageMessage: '',
+
         textMessage: '',
         mediaMessage: '',
         glyphMessage: '',
@@ -436,7 +435,7 @@ describe('update message tracker', () => {
         replyMessage: 'text0',
         reactionMessage: '',
         fileMessage: '',
-        imageMessage: '',
+
         textMessage: '',
         mediaMessage: '',
         glyphMessage: '',
@@ -445,7 +444,7 @@ describe('update message tracker', () => {
         replyMessage: 'text1',
         reactionMessage: '',
         fileMessage: '',
-        imageMessage: '',
+
         textMessage: '',
         mediaMessage: '',
         glyphMessage: '',
diff --git a/utilities/__snapshots__/Messaging.test.ts.snap b/utilities/__snapshots__/Messaging.test.ts.snap
index 7e54e0efc5..28da77065d 100644
--- a/utilities/__snapshots__/Messaging.test.ts.snap
+++ b/utilities/__snapshots__/Messaging.test.ts.snap
@@ -5,7 +5,6 @@ Array [
   Object {
     "fileMessage": "",
     "glyphMessage": "",
-    "imageMessage": "",
     "mediaMessage": "",
     "reactionMessage": "",
     "reactions": Array [],
@@ -16,7 +15,6 @@ Array [
   Object {
     "fileMessage": "",
     "glyphMessage": "",
-    "imageMessage": "",
     "mediaMessage": "",
     "reactionMessage": "",
     "reactions": Array [],
@@ -32,7 +30,6 @@ Object {
   "0": Object {
     "fileMessage": "",
     "glyphMessage": "",
-    "imageMessage": "",
     "mediaMessage": "",
     "reactionMessage": "",
     "replyMessage": "text1",
@@ -64,7 +61,6 @@ Object {
     "undefined": Object {
       "fileMessage": "",
       "glyphMessage": "",
-      "imageMessage": "",
       "mediaMessage": "",
       "reactionMessage": "",
       "replyMessage": "text1",
@@ -83,7 +79,6 @@ Object {
     "undefined": Object {
       "fileMessage": "",
       "glyphMessage": "",
-      "imageMessage": "",
       "mediaMessage": "",
       "reactionMessage": "",
       "replyMessage": "text1",
@@ -104,7 +99,6 @@ Object {
       Object {
         "fileMessage": "",
         "glyphMessage": "",
-        "imageMessage": "",
         "mediaMessage": "",
         "reactionMessage": "",
         "replyMessage": "text1",
@@ -126,7 +120,6 @@ Object {
       Object {
         "fileMessage": "",
         "glyphMessage": "",
-        "imageMessage": "",
         "mediaMessage": "",
         "reactionMessage": "",
         "replyMessage": "text1",
@@ -144,7 +137,6 @@ Object {
     "undefined": Object {
       "fileMessage": "",
       "glyphMessage": "",
-      "imageMessage": "",
       "mediaMessage": "",
       "reactionMessage": "",
       "replyMessage": "text1",