diff --git a/.gitignore b/.gitignore
index 2f5e8c055..ddf3d9873 100644
--- a/.gitignore
+++ b/.gitignore
@@ -99,3 +99,5 @@ _src/
 -src
 plugin copy
 pm2.yaml
+doc/TypeDoc/**
+doc/TypeDoc
diff --git a/doc/TypeDoc/assets/highlight.css b/doc/TypeDoc/assets/highlight.css
index 50d6eb22c..6c6dfb1b9 100644
--- a/doc/TypeDoc/assets/highlight.css
+++ b/doc/TypeDoc/assets/highlight.css
@@ -11,6 +11,10 @@
     --dark-hl-4: #6A9955;
     --light-hl-5: #098658;
     --dark-hl-5: #B5CEA8;
+    --light-hl-6: #001080;
+    --dark-hl-6: #9CDCFE;
+    --light-hl-7: #AF00DB;
+    --dark-hl-7: #C586C0;
     --light-code-background: #FFFFFF;
     --dark-code-background: #1E1E1E;
 }
@@ -22,6 +26,8 @@
     --hl-3: var(--light-hl-3);
     --hl-4: var(--light-hl-4);
     --hl-5: var(--light-hl-5);
+    --hl-6: var(--light-hl-6);
+    --hl-7: var(--light-hl-7);
     --code-background: var(--light-code-background);
 } }
 
@@ -32,6 +38,8 @@
     --hl-3: var(--dark-hl-3);
     --hl-4: var(--dark-hl-4);
     --hl-5: var(--dark-hl-5);
+    --hl-6: var(--dark-hl-6);
+    --hl-7: var(--dark-hl-7);
     --code-background: var(--dark-code-background);
 } }
 
@@ -42,6 +50,8 @@
     --hl-3: var(--light-hl-3);
     --hl-4: var(--light-hl-4);
     --hl-5: var(--light-hl-5);
+    --hl-6: var(--light-hl-6);
+    --hl-7: var(--light-hl-7);
     --code-background: var(--light-code-background);
 }
 
@@ -52,6 +62,8 @@
     --hl-3: var(--dark-hl-3);
     --hl-4: var(--dark-hl-4);
     --hl-5: var(--dark-hl-5);
+    --hl-6: var(--dark-hl-6);
+    --hl-7: var(--dark-hl-7);
     --code-background: var(--dark-code-background);
 }
 
@@ -61,4 +73,6 @@
 .hl-3 { color: var(--hl-3); }
 .hl-4 { color: var(--hl-4); }
 .hl-5 { color: var(--hl-5); }
+.hl-6 { color: var(--hl-6); }
+.hl-7 { color: var(--hl-7); }
 pre, code { background: var(--code-background); }
diff --git a/doc/TypeDoc/assets/navigation.js b/doc/TypeDoc/assets/navigation.js
index df0f5a6f1..4eab0eecd 100644
--- a/doc/TypeDoc/assets/navigation.js
+++ b/doc/TypeDoc/assets/navigation.js
@@ -1 +1 @@
-window.navigationData = "data:application/octet-stream;base64,H4sIAAAAAAAACouuVipJrShRslLyCnbLzEkNyXdKLE41M1HSUSpILMkAiqeV5iWXZObnFeujqtDLKMnNASrLzsxLUbIyM6mNBQDt34KsTAAAAA=="
\ No newline at end of file
+window.navigationData = "data:application/octet-stream;base64,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"
\ No newline at end of file
diff --git a/doc/TypeDoc/assets/search.js b/doc/TypeDoc/assets/search.js
index 33cf4adb7..7f8929720 100644
--- a/doc/TypeDoc/assets/search.js
+++ b/doc/TypeDoc/assets/search.js
@@ -1 +1 @@
-window.searchData = "data:application/octet-stream;base64,H4sIAAAAAAAAClVQy27CMBD8lzlbIQLEI8cekNprKy6RhUKyUd06NoodQLL872xeAi7WenZmdnYDWntzyPKAf2UqZJu1gCkaQoav74PS9GM/CkebNQS6VjNcd6b0yhq3eCckv77RzCp14RyxJxClALvSHVnAlVrHMsaXySrZM7NWpKt++DiRpbZpyHiuKlt2Qykn2pFKb9uePLIXKUSeimWy226lFPmsHfABmC0mZIjCGTxVn2MkdvpzNW/g7XlaMeA05U3nMwSk/MT4TMe/l4B9rze/qAtpZViRyxgfju4GSFgBAAA=";
\ No newline at end of file
+window.searchData = "data:application/octet-stream;base64,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";
\ No newline at end of file
diff --git a/doc/TypeDoc/functions/JSFileToBase64.html b/doc/TypeDoc/functions/JSFileToBase64.html
deleted file mode 100644
index 46a5a5d45..000000000
--- a/doc/TypeDoc/functions/JSFileToBase64.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html><html class="default" lang="en"><head><meta charset="utf-8"/><meta http-equiv="x-ua-compatible" content="IE=edge"/><title>JSFileToBase64 | gabinete-digital</title><meta name="description" content="Documentation for gabinete-digital"/><meta name="viewport" content="width=device-width, initial-scale=1"/><link rel="stylesheet" href="../assets/style.css"/><link rel="stylesheet" href="../assets/highlight.css"/><script defer src="../assets/main.js"></script><script async src="../assets/icons.js" id="tsd-icons-script"></script><script async src="../assets/search.js" id="tsd-search-script"></script><script async src="../assets/navigation.js" id="tsd-nav-script"></script></head><body><script>document.documentElement.dataset.theme = localStorage.getItem("tsd-theme") || "os";document.body.style.display="none";setTimeout(() => app?app.showPage():document.body.style.removeProperty("display"),500)</script><header class="tsd-page-toolbar"><div class="tsd-toolbar-contents container"><div class="table-cell" id="tsd-search" data-base=".."><div class="field"><label for="tsd-search-field" class="tsd-widget tsd-toolbar-icon search no-caption"><svg width="16" height="16" viewBox="0 0 16 16" fill="none"><use href="../assets/icons.svg#icon-search"></use></svg></label><input type="text" id="tsd-search-field" aria-label="Search"/></div><div class="field"><div id="tsd-toolbar-links"></div></div><ul class="results"><li class="state loading">Preparing search index...</li><li class="state failure">The search index is not available</li></ul><a href="../index.html" class="title">gabinete-digital</a></div><div class="table-cell" id="tsd-widgets"><a href="#" class="tsd-widget tsd-toolbar-icon menu no-caption" data-toggle="menu" aria-label="Menu"><svg width="16" height="16" viewBox="0 0 16 16" fill="none"><use href="../assets/icons.svg#icon-menu"></use></svg></a></div></div></header><div class="container container-main"><div class="col-content"><div class="tsd-page-title"><ul class="tsd-breadcrumb"><li><a href="../modules.html">gabinete-digital</a></li><li><a href="JSFileToBase64.html">JSFileToBase64</a></li></ul><h1>Function JSFileToBase64</h1></div><section class="tsd-panel"><ul class="tsd-signatures"><li class="tsd-signature tsd-anchor-link"><a id="JSFileToBase64" class="tsd-anchor"></a><span class="tsd-kind-call-signature">JSFile<wbr/>To<wbr/>Base64</span><span class="tsd-signature-symbol">(</span><span class="tsd-kind-parameter">file</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">Promise</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">Result</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">string</span><span class="tsd-signature-symbol">, </span><span class="tsd-signature-type">any</span><span class="tsd-signature-symbol">&gt;</span><span class="tsd-signature-symbol">&gt;</span><a href="#JSFileToBase64" aria-label="Permalink" class="tsd-anchor-icon"><svg viewBox="0 0 24 24"><use href="../assets/icons.svg#icon-anchor"></use></svg></a></li><li class="tsd-description"><div class="tsd-comment tsd-typography"><p>Converts a <code>File</code> object to a Base64 encoded string.</p>
-</div><div class="tsd-parameters"><h4 class="tsd-parameters-title">Parameters</h4><ul class="tsd-parameter-list"><li><span><span class="tsd-kind-parameter">file</span>: <span class="tsd-signature-type">File</span></span><div class="tsd-comment tsd-typography"><p>The file to be converted.</p>
-</div><div class="tsd-comment tsd-typography"></div></li></ul></div><h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">Promise</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">Result</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">string</span><span class="tsd-signature-symbol">, </span><span class="tsd-signature-type">any</span><span class="tsd-signature-symbol">&gt;</span><span class="tsd-signature-symbol">&gt;</span></h4><p>A promise that resolves with a <code>Result</code> object containing either the Base64 encoded string or an error.</p>
-<div class="tsd-comment tsd-typography"></div><aside class="tsd-sources"><ul><li>Defined in <a href="https://bitbucket.org/equilibriumito/gabinete-digital-fo/src/28bc141d389bc398728ff4bb15cacd51af677e25/src/app/utils/ToBase64.ts#lines-18">ToBase64.ts:18</a></li></ul></aside></li></ul></section></div><div class="col-sidebar"><div class="page-menu"><div class="tsd-navigation settings"><details class="tsd-accordion"><summary class="tsd-accordion-summary"><h3><svg width="20" height="20" viewBox="0 0 24 24" fill="none"><use href="../assets/icons.svg#icon-chevronDown"></use></svg>Settings</h3></summary><div class="tsd-accordion-details"><div class="tsd-filter-visibility"><span class="settings-label">Member Visibility</span><ul id="tsd-filter-options"><li class="tsd-filter-item"><label class="tsd-filter-input"><input type="checkbox" id="tsd-filter-protected" name="protected"/><svg width="32" height="32" viewBox="0 0 32 32" aria-hidden="true"><rect class="tsd-checkbox-background" width="30" height="30" x="1" y="1" rx="6" fill="none"></rect><path class="tsd-checkbox-checkmark" d="M8.35422 16.8214L13.2143 21.75L24.6458 10.25" stroke="none" stroke-width="3.5" stroke-linejoin="round" fill="none"></path></svg><span>Protected</span></label></li><li class="tsd-filter-item"><label class="tsd-filter-input"><input type="checkbox" id="tsd-filter-inherited" name="inherited" checked/><svg width="32" height="32" viewBox="0 0 32 32" aria-hidden="true"><rect class="tsd-checkbox-background" width="30" height="30" x="1" y="1" rx="6" fill="none"></rect><path class="tsd-checkbox-checkmark" d="M8.35422 16.8214L13.2143 21.75L24.6458 10.25" stroke="none" stroke-width="3.5" stroke-linejoin="round" fill="none"></path></svg><span>Inherited</span></label></li><li class="tsd-filter-item"><label class="tsd-filter-input"><input type="checkbox" id="tsd-filter-external" name="external"/><svg width="32" height="32" viewBox="0 0 32 32" aria-hidden="true"><rect class="tsd-checkbox-background" width="30" height="30" x="1" y="1" rx="6" fill="none"></rect><path class="tsd-checkbox-checkmark" d="M8.35422 16.8214L13.2143 21.75L24.6458 10.25" stroke="none" stroke-width="3.5" stroke-linejoin="round" fill="none"></path></svg><span>External</span></label></li></ul></div><div class="tsd-theme-toggle"><label class="settings-label" for="tsd-theme">Theme</label><select id="tsd-theme"><option value="os">OS</option><option value="light">Light</option><option value="dark">Dark</option></select></div></div></details></div></div><div class="site-menu"><nav class="tsd-navigation"><a href="../modules.html"><svg class="tsd-kind-icon" viewBox="0 0 24 24"><use href="../assets/icons.svg#icon-1"></use></svg><span>gabinete-digital</span></a><ul class="tsd-small-nested-navigation" id="tsd-nav-container" data-base=".."><li>Loading...</li></ul></nav></div></div></div><footer><p class="tsd-generator">Generated using <a href="https://typedoc.org/" target="_blank">TypeDoc</a></p></footer><div class="overlay"></div></body></html>
diff --git a/doc/TypeDoc/index.html b/doc/TypeDoc/index.html
index 9b23563ca..34d5582d3 100644
--- a/doc/TypeDoc/index.html
+++ b/doc/TypeDoc/index.html
@@ -33,4 +33,4 @@ ionic cap sync android</p>
 
 <a id="md:contributing" class="tsd-anchor"></a><h2 class="tsd-anchor-link">Contributing<a href="#md:contributing" aria-label="Permalink" class="tsd-anchor-icon"><svg viewBox="0 0 24 24"><use href="assets/icons.svg#icon-anchor"></use></svg></a></h2><p>For major changes, please open an issue first to discuss what you would like to change.</p>
 <p>Please make sure to update tests as appropriate.</p>
-</div></div><div class="col-sidebar"><div class="page-menu"><div class="tsd-navigation settings"><details class="tsd-accordion"><summary class="tsd-accordion-summary"><h3><svg width="20" height="20" viewBox="0 0 24 24" fill="none"><use href="assets/icons.svg#icon-chevronDown"></use></svg>Settings</h3></summary><div class="tsd-accordion-details"><div class="tsd-filter-visibility"><span class="settings-label">Member Visibility</span><ul id="tsd-filter-options"><li class="tsd-filter-item"><label class="tsd-filter-input"><input type="checkbox" id="tsd-filter-protected" name="protected"/><svg width="32" height="32" viewBox="0 0 32 32" aria-hidden="true"><rect class="tsd-checkbox-background" width="30" height="30" x="1" y="1" rx="6" fill="none"></rect><path class="tsd-checkbox-checkmark" d="M8.35422 16.8214L13.2143 21.75L24.6458 10.25" stroke="none" stroke-width="3.5" stroke-linejoin="round" fill="none"></path></svg><span>Protected</span></label></li><li class="tsd-filter-item"><label class="tsd-filter-input"><input type="checkbox" id="tsd-filter-inherited" name="inherited" checked/><svg width="32" height="32" viewBox="0 0 32 32" aria-hidden="true"><rect class="tsd-checkbox-background" width="30" height="30" x="1" y="1" rx="6" fill="none"></rect><path class="tsd-checkbox-checkmark" d="M8.35422 16.8214L13.2143 21.75L24.6458 10.25" stroke="none" stroke-width="3.5" stroke-linejoin="round" fill="none"></path></svg><span>Inherited</span></label></li><li class="tsd-filter-item"><label class="tsd-filter-input"><input type="checkbox" id="tsd-filter-external" name="external"/><svg width="32" height="32" viewBox="0 0 32 32" aria-hidden="true"><rect class="tsd-checkbox-background" width="30" height="30" x="1" y="1" rx="6" fill="none"></rect><path class="tsd-checkbox-checkmark" d="M8.35422 16.8214L13.2143 21.75L24.6458 10.25" stroke="none" stroke-width="3.5" stroke-linejoin="round" fill="none"></path></svg><span>External</span></label></li></ul></div><div class="tsd-theme-toggle"><label class="settings-label" for="tsd-theme">Theme</label><select id="tsd-theme"><option value="os">OS</option><option value="light">Light</option><option value="dark">Dark</option></select></div></div></details></div><details open class="tsd-accordion tsd-page-navigation"><summary class="tsd-accordion-summary"><h3><svg width="20" height="20" viewBox="0 0 24 24" fill="none"><use href="assets/icons.svg#icon-chevronDown"></use></svg>On This Page</h3></summary><div class="tsd-accordion-details"><a href="#md:gabinete-digital-v01"><span>Gabinete <wbr/>Digital v0.1</span></a><ul><li><a href="#md:requirements"><span>Requirements</span></a></li><li><a href="#md:installation"><span>Installation</span></a></li><li><a href="#md:envarioment-depedencies"><span>Envarioment <wbr/>Depedencies</span></a></li><li><a href="#md:bug"><span>BUG</span></a></li><li><a href="#md:start-the-development-server"><span>Start the development server</span></a></li><li><a href="#md:build-for-production-and-launch-server"><span>build for production and launch server</span></a></li><li><a href="#md:run-test"><span>Run test</span></a></li><li><a href="#md:deploy-in-local-network"><span>Deploy in local network</span></a></li></ul><a href="#md:open-xcode"><span>Open xcode</span></a><a href="#md:android"><span>Android</span></a><ul><li><a href="#md:tag-stable-version"><span>Tag stable version</span></a></li><li><a href="#md:contributing"><span>Contributing</span></a></li></ul></div></details></div><div class="site-menu"><nav class="tsd-navigation"><a href="modules.html" class="current"><svg class="tsd-kind-icon" viewBox="0 0 24 24"><use href="assets/icons.svg#icon-1"></use></svg><span>gabinete-digital</span></a><ul class="tsd-small-nested-navigation" id="tsd-nav-container" data-base="."><li>Loading...</li></ul></nav></div></div></div><footer><p class="tsd-generator">Generated using <a href="https://typedoc.org/" target="_blank">TypeDoc</a></p></footer><div class="overlay"></div></body></html>
+</div></div><div class="col-sidebar"><div class="page-menu"><div class="tsd-navigation settings"><details class="tsd-accordion"><summary class="tsd-accordion-summary"><h3><svg width="20" height="20" viewBox="0 0 24 24" fill="none"><use href="assets/icons.svg#icon-chevronDown"></use></svg>Settings</h3></summary><div class="tsd-accordion-details"><div class="tsd-filter-visibility"><span class="settings-label">Member Visibility</span><ul id="tsd-filter-options"><li class="tsd-filter-item"><label class="tsd-filter-input"><input type="checkbox" id="tsd-filter-protected" name="protected"/><svg width="32" height="32" viewBox="0 0 32 32" aria-hidden="true"><rect class="tsd-checkbox-background" width="30" height="30" x="1" y="1" rx="6" fill="none"></rect><path class="tsd-checkbox-checkmark" d="M8.35422 16.8214L13.2143 21.75L24.6458 10.25" stroke="none" stroke-width="3.5" stroke-linejoin="round" fill="none"></path></svg><span>Protected</span></label></li><li class="tsd-filter-item"><label class="tsd-filter-input"><input type="checkbox" id="tsd-filter-inherited" name="inherited" checked/><svg width="32" height="32" viewBox="0 0 32 32" aria-hidden="true"><rect class="tsd-checkbox-background" width="30" height="30" x="1" y="1" rx="6" fill="none"></rect><path class="tsd-checkbox-checkmark" d="M8.35422 16.8214L13.2143 21.75L24.6458 10.25" stroke="none" stroke-width="3.5" stroke-linejoin="round" fill="none"></path></svg><span>Inherited</span></label></li><li class="tsd-filter-item"><label class="tsd-filter-input"><input type="checkbox" id="tsd-filter-external" name="external"/><svg width="32" height="32" viewBox="0 0 32 32" aria-hidden="true"><rect class="tsd-checkbox-background" width="30" height="30" x="1" y="1" rx="6" fill="none"></rect><path class="tsd-checkbox-checkmark" d="M8.35422 16.8214L13.2143 21.75L24.6458 10.25" stroke="none" stroke-width="3.5" stroke-linejoin="round" fill="none"></path></svg><span>External</span></label></li></ul></div><div class="tsd-theme-toggle"><label class="settings-label" for="tsd-theme">Theme</label><select id="tsd-theme"><option value="os">OS</option><option value="light">Light</option><option value="dark">Dark</option></select></div></div></details></div><details open class="tsd-accordion tsd-page-navigation"><summary class="tsd-accordion-summary"><h3><svg width="20" height="20" viewBox="0 0 24 24" fill="none"><use href="assets/icons.svg#icon-chevronDown"></use></svg>On This Page</h3></summary><div class="tsd-accordion-details"><a href="#md:gabinete-digital-v01"><span>Gabinete <wbr/>Digital v0.1</span></a><ul><li><a href="#md:requirements"><span>Requirements</span></a></li><li><a href="#md:installation"><span>Installation</span></a></li><li><a href="#md:envarioment-depedencies"><span>Envarioment <wbr/>Depedencies</span></a></li><li><a href="#md:bug"><span>BUG</span></a></li><li><a href="#md:start-the-development-server"><span>Start the development server</span></a></li><li><a href="#md:build-for-production-and-launch-server"><span>build for production and launch server</span></a></li><li><a href="#md:run-test"><span>Run test</span></a></li><li><a href="#md:deploy-in-local-network"><span>Deploy in local network</span></a></li></ul><a href="#md:open-xcode"><span>Open xcode</span></a><a href="#md:android"><span>Android</span></a><ul><li><a href="#md:tag-stable-version"><span>Tag stable version</span></a></li><li><a href="#md:contributing"><span>Contributing</span></a></li></ul></div></details></div><div class="site-menu"><nav class="tsd-navigation"><a href="index.html" class="current"><svg class="tsd-kind-icon" viewBox="0 0 24 24"><use href="assets/icons.svg#icon-1"></use></svg><span>gabinete-digital</span></a><ul class="tsd-small-nested-navigation" id="tsd-nav-container" data-base="."><li>Loading...</li></ul></nav></div></div></div><footer><p class="tsd-generator">Generated using <a href="https://typedoc.org/" target="_blank">TypeDoc</a></p></footer><div class="overlay"></div></body></html>
diff --git a/doc/TypeDoc/modules.html b/doc/TypeDoc/modules.html
deleted file mode 100644
index ca4627031..000000000
--- a/doc/TypeDoc/modules.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE html><html class="default" lang="en"><head><meta charset="utf-8"/><meta http-equiv="x-ua-compatible" content="IE=edge"/><title>gabinete-digital</title><meta name="description" content="Documentation for gabinete-digital"/><meta name="viewport" content="width=device-width, initial-scale=1"/><link rel="stylesheet" href="assets/style.css"/><link rel="stylesheet" href="assets/highlight.css"/><script defer src="assets/main.js"></script><script async src="assets/icons.js" id="tsd-icons-script"></script><script async src="assets/search.js" id="tsd-search-script"></script><script async src="assets/navigation.js" id="tsd-nav-script"></script></head><body><script>document.documentElement.dataset.theme = localStorage.getItem("tsd-theme") || "os";document.body.style.display="none";setTimeout(() => app?app.showPage():document.body.style.removeProperty("display"),500)</script><header class="tsd-page-toolbar"><div class="tsd-toolbar-contents container"><div class="table-cell" id="tsd-search" data-base="."><div class="field"><label for="tsd-search-field" class="tsd-widget tsd-toolbar-icon search no-caption"><svg width="16" height="16" viewBox="0 0 16 16" fill="none"><use href="assets/icons.svg#icon-search"></use></svg></label><input type="text" id="tsd-search-field" aria-label="Search"/></div><div class="field"><div id="tsd-toolbar-links"></div></div><ul class="results"><li class="state loading">Preparing search index...</li><li class="state failure">The search index is not available</li></ul><a href="index.html" class="title">gabinete-digital</a></div><div class="table-cell" id="tsd-widgets"><a href="#" class="tsd-widget tsd-toolbar-icon menu no-caption" data-toggle="menu" aria-label="Menu"><svg width="16" height="16" viewBox="0 0 16 16" fill="none"><use href="assets/icons.svg#icon-menu"></use></svg></a></div></div></header><div class="container container-main"><div class="col-content"><div class="tsd-page-title"><h2>gabinete-digital</h2></div><section class="tsd-panel-group tsd-index-group"><section class="tsd-panel tsd-index-panel"><h3 class="tsd-index-heading uppercase">Index</h3><section class="tsd-index-section"><h3 class="tsd-index-heading">Functions</h3><div class="tsd-index-list"><a href="functions/JSFileToBase64.html" class="tsd-index-link"><svg class="tsd-kind-icon" viewBox="0 0 24 24"><use href="assets/icons.svg#icon-64"></use></svg><span>JSFile<wbr/>To<wbr/>Base64</span></a>
-</div></section></section></section></div><div class="col-sidebar"><div class="page-menu"><div class="tsd-navigation settings"><details class="tsd-accordion"><summary class="tsd-accordion-summary"><h3><svg width="20" height="20" viewBox="0 0 24 24" fill="none"><use href="assets/icons.svg#icon-chevronDown"></use></svg>Settings</h3></summary><div class="tsd-accordion-details"><div class="tsd-filter-visibility"><span class="settings-label">Member Visibility</span><ul id="tsd-filter-options"><li class="tsd-filter-item"><label class="tsd-filter-input"><input type="checkbox" id="tsd-filter-protected" name="protected"/><svg width="32" height="32" viewBox="0 0 32 32" aria-hidden="true"><rect class="tsd-checkbox-background" width="30" height="30" x="1" y="1" rx="6" fill="none"></rect><path class="tsd-checkbox-checkmark" d="M8.35422 16.8214L13.2143 21.75L24.6458 10.25" stroke="none" stroke-width="3.5" stroke-linejoin="round" fill="none"></path></svg><span>Protected</span></label></li><li class="tsd-filter-item"><label class="tsd-filter-input"><input type="checkbox" id="tsd-filter-inherited" name="inherited" checked/><svg width="32" height="32" viewBox="0 0 32 32" aria-hidden="true"><rect class="tsd-checkbox-background" width="30" height="30" x="1" y="1" rx="6" fill="none"></rect><path class="tsd-checkbox-checkmark" d="M8.35422 16.8214L13.2143 21.75L24.6458 10.25" stroke="none" stroke-width="3.5" stroke-linejoin="round" fill="none"></path></svg><span>Inherited</span></label></li><li class="tsd-filter-item"><label class="tsd-filter-input"><input type="checkbox" id="tsd-filter-external" name="external"/><svg width="32" height="32" viewBox="0 0 32 32" aria-hidden="true"><rect class="tsd-checkbox-background" width="30" height="30" x="1" y="1" rx="6" fill="none"></rect><path class="tsd-checkbox-checkmark" d="M8.35422 16.8214L13.2143 21.75L24.6458 10.25" stroke="none" stroke-width="3.5" stroke-linejoin="round" fill="none"></path></svg><span>External</span></label></li></ul></div><div class="tsd-theme-toggle"><label class="settings-label" for="tsd-theme">Theme</label><select id="tsd-theme"><option value="os">OS</option><option value="light">Light</option><option value="dark">Dark</option></select></div></div></details></div></div><div class="site-menu"><nav class="tsd-navigation"><a href="modules.html" class="current"><svg class="tsd-kind-icon" viewBox="0 0 24 24"><use href="assets/icons.svg#icon-1"></use></svg><span>gabinete-digital</span></a><ul class="tsd-small-nested-navigation" id="tsd-nav-container" data-base="."><li>Loading...</li></ul></nav></div></div></div><footer><p class="tsd-generator">Generated using <a href="https://typedoc.org/" target="_blank">TypeDoc</a></p></footer><div class="overlay"></div></body></html>
diff --git a/package-lock.json b/package-lock.json
index ea85ff25e..320307dee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -248,7 +248,7 @@
         "protractor": "~7.0.0",
         "ts-node": "~8.3.0",
         "tslint": "^6.1.3",
-        "typescript": "^4.3.5",
+        "typescript": "4.6",
         "uk.co.workingedge.cordova.plugin.sqliteporter": "^1.1.1"
       }
     },
@@ -574,6 +574,22 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/@ngtools/webpack": {
+      "version": "12.2.18",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-12.2.18.tgz",
+      "integrity": "sha512-6h/QSG6oZDs2BGfrozdOKqtM5daoCu05q+0gyb3owHz1u9FtMeXXKQ3sQfyFC/GNT3dTMlH6YFxsJPvMPwuy9A==",
+      "dev": true,
+      "engines": {
+        "node": "^12.14.1 || >=14.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "@angular/compiler-cli": "^12.0.0",
+        "typescript": "~4.2.3 || ~4.3.2",
+        "webpack": "^5.30.0"
+      }
+    },
     "node_modules/@angular-devkit/build-angular/node_modules/@types/estree": {
       "version": "0.0.50",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz",
@@ -994,6 +1010,19 @@
       "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==",
       "dev": true
     },
+    "node_modules/@angular-devkit/build-optimizer/node_modules/typescript": {
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz",
+      "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==",
+      "dev": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    },
     "node_modules/@angular-devkit/build-webpack": {
       "version": "0.1202.18",
       "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1202.18.tgz",
@@ -7593,22 +7622,6 @@
         "rxjs": "^6.5.3"
       }
     },
-    "node_modules/@ngtools/webpack": {
-      "version": "12.2.18",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-12.2.18.tgz",
-      "integrity": "sha512-6h/QSG6oZDs2BGfrozdOKqtM5daoCu05q+0gyb3owHz1u9FtMeXXKQ3sQfyFC/GNT3dTMlH6YFxsJPvMPwuy9A==",
-      "dev": true,
-      "engines": {
-        "node": "^12.14.1 || >=14.0.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "@angular/compiler-cli": "^12.0.0",
-        "typescript": "~4.2.3 || ~4.3.2",
-        "webpack": "^5.30.0"
-      }
-    },
     "node_modules/@ngx-translate/core": {
       "version": "13.0.0",
       "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-13.0.0.tgz",
@@ -41957,9 +41970,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz",
-      "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==",
+      "version": "4.6.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz",
+      "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -44629,6 +44642,13 @@
             "@babel/types": "^7.14.5"
           }
         },
+        "@ngtools/webpack": {
+          "version": "12.2.18",
+          "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-12.2.18.tgz",
+          "integrity": "sha512-6h/QSG6oZDs2BGfrozdOKqtM5daoCu05q+0gyb3owHz1u9FtMeXXKQ3sQfyFC/GNT3dTMlH6YFxsJPvMPwuy9A==",
+          "dev": true,
+          "requires": {}
+        },
         "@types/estree": {
           "version": "0.0.50",
           "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz",
@@ -44951,6 +44971,12 @@
           "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
           "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==",
           "dev": true
+        },
+        "typescript": {
+          "version": "4.3.5",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz",
+          "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==",
+          "dev": true
         }
       }
     },
@@ -49842,13 +49868,6 @@
         "tslib": "^2.0.0"
       }
     },
-    "@ngtools/webpack": {
-      "version": "12.2.18",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-12.2.18.tgz",
-      "integrity": "sha512-6h/QSG6oZDs2BGfrozdOKqtM5daoCu05q+0gyb3owHz1u9FtMeXXKQ3sQfyFC/GNT3dTMlH6YFxsJPvMPwuy9A==",
-      "dev": true,
-      "requires": {}
-    },
     "@ngx-translate/core": {
       "version": "13.0.0",
       "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-13.0.0.tgz",
@@ -76457,9 +76476,9 @@
       }
     },
     "typescript": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz",
-      "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA=="
+      "version": "4.6.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz",
+      "integrity": "sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg=="
     },
     "ua-parser-js": {
       "version": "0.7.31",
diff --git a/package.json b/package.json
index 969326f30..af1ad9c7a 100644
--- a/package.json
+++ b/package.json
@@ -265,7 +265,7 @@
     "protractor": "~7.0.0",
     "ts-node": "~8.3.0",
     "tslint": "^6.1.3",
-    "typescript": "^4.3.5",
+    "typescript": "4.6",
     "uk.co.workingedge.cordova.plugin.sqliteporter": "^1.1.1"
   },
   "description": "An Ionic project",
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index e17803e28..55ee873c9 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -9,7 +9,6 @@ import { Storage } from '@ionic/storage';
 import { register } from 'swiper/element/bundle';
 import { DomSanitizer } from '@angular/platform-browser';
 import { ScreenOrientation } from "@ionic-native/screen-orientation/ngx";
-import { ChatServiceService } from 'src/app/module/chat/chat-service.service'
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
   parse: {
     dateInput: "YYYY-MMMM-DD HH:mm"
@@ -39,7 +38,6 @@ export class AppComponent {
       private storage: Storage,
       private sanitizer: DomSanitizer,
       private screenOrientation: ScreenOrientation,
-      private ChatServiceService: ChatServiceService
   ) {
 
     window["sanitizer"] = this.sanitizer
diff --git a/src/app/infra/camera/camera.service.ts b/src/app/infra/camera/camera.service.ts
index 452ab3381..67e24e7a0 100644
--- a/src/app/infra/camera/camera.service.ts
+++ b/src/app/infra/camera/camera.service.ts
@@ -2,33 +2,49 @@ import { Injectable } from '@angular/core';
 import { Camera, CameraResultType, CameraSource } from '@capacitor/camera';
 import { err, ok } from 'neverthrow';
 
+/**
+ * Parameters for taking a picture.
+ * @typedef {Object} takePictureParams
+ * @property {number} [quality=90] - The quality of the picture, from 0 to 100.
+ * @property {CameraResultType} cameraResultType - The result type of the photo, e.g., Base64, URI.
+ */
+export type takePictureParams = {
+  quality?: number;
+  cameraResultType: CameraResultType;
+};
 
-type takePictureParams = {
-  quality?: number
-  cameraResultType: CameraResultType
-}
-
+/**
+ * Service for handling camera functionality.
+ * This service provides methods to interact with the device's camera.
+ */
 @Injectable({
   providedIn: 'root'
 })
 export class CameraService {
 
+  /**
+   * Creates an instance of CameraService.
+   */
   constructor() { }
 
-
+  /**
+   * Takes a picture using the device's camera.
+   * @param {takePictureParams} params - The parameters for taking the picture.
+   * @param {number} [params.quality=90] - The quality of the picture, from 0 to 100.
+   * @param {CameraResultType} params.cameraResultType - The result type of the photo.
+   * @returns {Promise<ok<File> | err<any>>} A promise that resolves with an `ok` result containing the file or an `err` result containing the error.
+   */
   async takePicture({quality = 90, cameraResultType }: takePictureParams) {
-
     try {
       const file = await Camera.getPhoto({
         quality: quality,
-        // allowEditing: true,
         resultType: cameraResultType,
         source: CameraSource.Camera
       });
 
-      return ok(file)
+      return ok(file);
     } catch (e) {
-      return err(e)
+      return err(e);
     }
   }
 }
diff --git a/src/app/infra/file-picker/file-picker.service.ts b/src/app/infra/file-picker/file-picker.service.ts
new file mode 100644
index 000000000..44c390541
--- /dev/null
+++ b/src/app/infra/file-picker/file-picker.service.ts
@@ -0,0 +1,50 @@
+import { Injectable } from '@angular/core';
+import { Camera, CameraResultType, CameraSource } from '@capacitor/camera';
+import { err, ok } from 'neverthrow';
+
+/**
+ * Parameters for picking a picture.
+ * @typedef {Object} PickPictureParams
+ * @property {number} [quality=90] - The quality of the picture, from 0 to 100. Defaults to 90.
+ * @property {CameraResultType} [cameraResultType=CameraResultType.DataUrl] - The result type of the photo. Defaults to `CameraResultType.DataUrl`.
+ */
+type PickPictureParams = {
+  quality?: number;
+  cameraResultType?: CameraResultType;
+};
+
+/**
+ * Service for handling file picking functionality.
+ * This service provides methods to pick a picture from the device's photo library.
+ */
+@Injectable({
+  providedIn: 'root'
+})
+export class FilePickerService {
+
+  /**
+   * Creates an instance of FilePickerService.
+   */
+  constructor() { }
+
+  /**
+   * Picks a picture from the device's photo library.
+   * @param {PickPictureParams} params - The parameters for picking the picture.
+   * @param {number} [params.quality=90] - The quality of the picture, from 0 to 100. Defaults to 90.
+   * @param {CameraResultType} [params.cameraResultType=CameraResultType.DataUrl] - The result type of the photo. Defaults to `CameraResultType.DataUrl`.
+   * @returns {Promise<ok<File> | err<any>>} A promise that resolves with an `ok` result containing the file or an `err` result containing the error.
+   */
+  async getPicture({quality = 90, cameraResultType = CameraResultType.DataUrl }: PickPictureParams) {
+    try {
+      const file = await Camera.getPhoto({
+        quality: quality,
+        resultType: cameraResultType,
+        source: CameraSource.Photos
+      });
+
+      return ok(file);
+    } catch (e) {
+      return err(e);
+    }
+  }
+}
diff --git a/src/app/infra/file-picker/mobile/file-picker-mobile.service.ts b/src/app/infra/file-picker/mobile/file-picker-mobile.service.ts
new file mode 100644
index 000000000..b7228276e
--- /dev/null
+++ b/src/app/infra/file-picker/mobile/file-picker-mobile.service.ts
@@ -0,0 +1,28 @@
+import { Injectable } from '@angular/core';
+import { FilePicker, PickFilesResult } from '@capawesome/capacitor-file-picker';
+import { err, ok, Result } from 'neverthrow';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class FilePickerMobileService {
+
+  constructor() { }
+
+  async getFile({types, multiple, readData}): Promise<Result<PickFilesResult, any>> {
+    try {
+
+      const result = await FilePicker.pickFiles({
+        types: ['application/pdf', 'application/doc', 'application/docx','application/xls', 'application/xlsx', 'application/ppt',
+        'application/pptx', 'application/txt'],
+        multiple: false,
+        readData: true,
+      });
+
+      return ok(result)
+    } catch (e) {
+      return err(e)
+    }
+
+  }
+}
diff --git a/src/app/infra/file-picker/web/file-picker-web.service.ts b/src/app/infra/file-picker/web/file-picker-web.service.ts
index 1cd39cf59..c045883cf 100644
--- a/src/app/infra/file-picker/web/file-picker-web.service.ts
+++ b/src/app/infra/file-picker/web/file-picker-web.service.ts
@@ -3,10 +3,7 @@ import { Camera, CameraResultType, CameraSource } from '@capacitor/camera';
 import { err, ok, Result } from 'neverthrow';
 import { FileType } from 'src/app/models/fileType';
 
-type PickPictureParams = {
-  quality?: number,
-  cameraResultType?: CameraResultType
-}
+
 
 @Injectable({
   providedIn: 'root'
@@ -30,19 +27,4 @@ export class FilePickerWebService {
     })
   }
 
-  async getPicture({quality = 90, cameraResultType =CameraResultType.DataUrl }: PickPictureParams) {
-    try {
-      const file = await Camera.getPhoto({
-        quality: quality,
-        // allowEditing: true,
-        resultType: cameraResultType,
-        source: CameraSource.Photos
-      });
-
-      return ok(file)
-    } catch (e) {
-      return err(e)
-    }
-  }
-
 }
diff --git a/src/app/infra/speaker/type.ts b/src/app/infra/speaker/type.ts
new file mode 100644
index 000000000..4a084fd74
--- /dev/null
+++ b/src/app/infra/speaker/type.ts
@@ -0,0 +1,11 @@
+export enum StartRecordingResultError  {
+  NoSpeaker,
+  NeedPermission,
+  alreadyRecording
+}
+
+export enum StopRecordingResultError  {
+  haventStartYet,
+  NoValue,
+  UnknownError
+}
diff --git a/src/app/module/chat/chat-service.service.ts b/src/app/module/chat/chat-service.service.ts
deleted file mode 100644
index f76466176..000000000
--- a/src/app/module/chat/chat-service.service.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Injectable } from '@angular/core';
-import { UserTypingAsyncService } from 'src/app/module/chat/data/async/socket/user-typing-async.service'
-
-@Injectable({
-  providedIn: 'root'
-})
-export class ChatServiceService {
-
-  constructor(
-    private UserTypingAsyncService: UserTypingAsyncService
-  ) { }
-}
diff --git a/src/app/module/chat/chat.module.ts b/src/app/module/chat/chat.module.ts
index d8baf4ea6..a7e102d06 100644
--- a/src/app/module/chat/chat.module.ts
+++ b/src/app/module/chat/chat.module.ts
@@ -1,6 +1,8 @@
 import { NgModule } from '@angular/core';
 import { SignalRService } from 'src/app/module/chat/infra/socket/signal-r.service'
 import { SyncMessageRepositoryService } from './data/service/sync-repository/sync-message-repository.service';
+import { UserTypingAsyncService } from 'src/app/module/chat/data/async/socket/user-typing-async.service'
+
 @NgModule({
   imports: [
 
@@ -16,7 +18,8 @@ export class ChatModule {
 
   constructor(
     private message: SyncMessageRepositoryService,
-    private SignalRService: SignalRService
+    private SignalRService: SignalRService,
+    private UserTypingAsyncService: UserTypingAsyncService
   ) {
 
 
diff --git a/src/app/module/chat/data/async/repository/message-repository-aync.service.spec.ts b/src/app/module/chat/data/async/repository/message-repository-aync.service.spec.ts
deleted file mode 100644
index 03d1d6ce9..000000000
--- a/src/app/module/chat/data/async/repository/message-repository-aync.service.spec.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { MessageRepositoryAyncService } from './message-repository-aync.service';
-
-describe('MessageRepositoryAyncService', () => {
-  let service: MessageRepositoryAyncService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(MessageRepositoryAyncService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});
diff --git a/src/app/module/chat/data/async/repository/message-repository-aync.service.ts b/src/app/module/chat/data/async/repository/message-repository-aync.service.ts
index 52d5122e7..12f1223fc 100644
--- a/src/app/module/chat/data/async/repository/message-repository-aync.service.ts
+++ b/src/app/module/chat/data/async/repository/message-repository-aync.service.ts
@@ -3,10 +3,9 @@ import { Injectable } from '@angular/core';
 @Injectable({
   providedIn: 'root'
 })
-export class MessageRepositoryAyncService {
+export class MessageRepositorySyncService {
 
   constructor() {
 
-    // alert('hellor')
   }
 }
diff --git a/src/app/module/chat/data/data-source/attachment/message-local-data-source.service.ts b/src/app/module/chat/data/data-source/attachment/message-local-data-source.service.ts
new file mode 100644
index 000000000..1cd4875c9
--- /dev/null
+++ b/src/app/module/chat/data/data-source/attachment/message-local-data-source.service.ts
@@ -0,0 +1,21 @@
+import { Injectable } from '@angular/core';
+import { Observable, Subject } from 'rxjs';
+import { DexieRepository } from 'src/app/infra/repository/dexie/dexie-repository.service';
+import { chatDatabase } from '../../../infra/database/dexie/service';
+import { Observable as  DexieObservable, PromiseExtended } from 'Dexie';
+import { AttachmentTable } from '../../../infra/database/dexie/schema/attachment';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class AttachmentLocalDataSourceService extends DexieRepository<AttachmentTable>  {
+
+  messageSubject = new Subject();
+
+  constructor() {
+    super(chatDatabase.attachment)
+  }
+
+ 
+}
+
diff --git a/src/app/module/chat/data/data-source/message/message-live-signalr-data-source.service.ts b/src/app/module/chat/data/data-source/message/message-live-signalr-data-source.service.ts
index d309c14d8..64b204b24 100644
--- a/src/app/module/chat/data/data-source/message/message-live-signalr-data-source.service.ts
+++ b/src/app/module/chat/data/data-source/message/message-live-signalr-data-source.service.ts
@@ -2,7 +2,6 @@ import { Injectable } from '@angular/core';
 import { err, ok } from 'neverthrow';
 import { SignalRService } from '../../../infra/socket/signal-r.service';
 
-
 interface msgObj {
   roomId: string;
   senderId: string;
@@ -35,4 +34,18 @@ export class MessageLiveDataSourceService {
 
   }
 
+  listenToMessages() {
+    return this.messageLiveSignalRDataSourceService.getMessage()
+  }
+
+
+  listenToDeleteMessages() {
+    return this.messageLiveSignalRDataSourceService.getMessageDelete()
+  }
+
+
+  listenToUpdateMessages() {
+    return this.messageLiveSignalRDataSourceService.getMessageUpdate()
+  }
+
 }
diff --git a/src/app/module/chat/data/data-source/message/message-local-data-source.service.ts b/src/app/module/chat/data/data-source/message/message-local-data-source.service.ts
index a71f074a6..9111f7697 100644
--- a/src/app/module/chat/data/data-source/message/message-local-data-source.service.ts
+++ b/src/app/module/chat/data/data-source/message/message-local-data-source.service.ts
@@ -1,13 +1,13 @@
 import { Injectable } from '@angular/core';
-import { Dexie, EntityTable, liveQuery } from 'Dexie';
+import { liveQuery } from 'Dexie';
 import { err, ok, Result } from 'neverthrow';
-import { from, Observable, Subject } from 'rxjs';
+import { Observable, Subject } from 'rxjs';
 import { filter } from 'rxjs/operators';
-import { MessageInputDTO } from '../../dto/message/messageInputDtO';
 import { MessageEntity } from '../../../domain/entity/message';
 import { DexieRepository } from 'src/app/infra/repository/dexie/dexie-repository.service';
 import { MessageTable } from 'src/app/module/chat/infra/database/dexie/schema/message';
 import { chatDatabase } from '../../../infra/database/dexie/service';
+import { Observable as  DexieObservable, PromiseExtended } from 'Dexie';
 
 @Injectable({
   providedIn: 'root'
@@ -61,7 +61,7 @@ export class MessageLocalDataSourceService extends DexieRepository<MessageTable>
   }
 
 
-  async sendMessage(data: MessageInputDTO) {
+  async sendMessage(data: MessageTable) {
 
     (data as MessageTable).sending = true
 
@@ -76,9 +76,8 @@ export class MessageLocalDataSourceService extends DexieRepository<MessageTable>
   }
 
 
-
  //  @ValidateSchema(tableSchema)
-  async createMessage(data: MessageInputDTO) {
+  async createMessage(data: MessageTable) {
 
     try {
       const result = await chatDatabase.message.add(data)
@@ -90,7 +89,7 @@ export class MessageLocalDataSourceService extends DexieRepository<MessageTable>
 
   }
 
-  async createManyMessage(data: MessageInputDTO[]) {
+  async createManyMessage(data: MessageTable[]) {
 
     try {
       const result = await chatDatabase.message.bulkAdd(data)
@@ -147,12 +146,12 @@ export class MessageLocalDataSourceService extends DexieRepository<MessageTable>
     }
   }
 
-  getItems(roomId: string) {
-    return  chatDatabase.message.where('roomId').equals(roomId).toArray()
+  getItems(roomId: string): PromiseExtended<MessageEntity[]> {
+    return chatDatabase.message.where('roomId').equals(roomId).sortBy('$id') as any
   }
 
-  getItemsLive(roomId: string) {
-    return liveQuery(() => chatDatabase.message.where('roomId').equals(roomId).sortBy('$id'))
+  getItemsLive(roomId: string): DexieObservable<MessageEntity[]> {
+    return liveQuery(() => chatDatabase.message.where('roomId').equals(roomId).sortBy('$id') as any)
   }
 
 
diff --git a/src/app/module/chat/data/data-source/message/message-memory-data-source.service.ts b/src/app/module/chat/data/data-source/message/message-memory-data-source.service.ts
new file mode 100644
index 000000000..8f5e2b11b
--- /dev/null
+++ b/src/app/module/chat/data/data-source/message/message-memory-data-source.service.ts
@@ -0,0 +1,11 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class MessageMemoryDataSourceService {
+
+  messages: {[roomId: string]: string[]} = {}
+
+  constructor() {}
+}
diff --git a/src/app/module/chat/data/data-source/message/message-remote-data-source.service.ts b/src/app/module/chat/data/data-source/message/message-remote-data-source.service.ts
index a9654790e..f658385fb 100644
--- a/src/app/module/chat/data/data-source/message/message-remote-data-source.service.ts
+++ b/src/app/module/chat/data/data-source/message/message-remote-data-source.service.ts
@@ -31,4 +31,10 @@ export class MessageRemoteDataSourceService {
     return await this.httpService.get(`${this.baseUrl}/Room/${id}/Messages`);
   }
 
+
+  @APIReturn(MessageOutPutDTOSchema, 'get/Messages/attachment')
+  async getAttachment(id: string): DataSourceReturn<MessageOutPutDTO>  {
+    return await this.httpService.get(`${this.baseUrl}/attachment/${id}`);
+  }
+
 }
diff --git a/src/app/module/chat/data/data-source/room/room-live-data-source.service.ts b/src/app/module/chat/data/data-source/room/room-live-data-source.service.ts
index f2f9a6ed7..2d9b33a85 100644
--- a/src/app/module/chat/data/data-source/room/room-live-data-source.service.ts
+++ b/src/app/module/chat/data/data-source/room/room-live-data-source.service.ts
@@ -1,13 +1,15 @@
 import { Injectable } from '@angular/core';
-import { WebSocketMessage, WebSocketService } from '../../../infra/socket/socket';
-import { err, ok } from 'neverthrow';
-
+import { SignalRService } from '../../../infra/socket/signal-r.service';
+import { AddMemberToRoomInputDTO } from '../../dto/room/addMemberToRoomInputDto';
+import { v4 as uuidv4 } from 'uuid'
 @Injectable({
   providedIn: 'root'
 })
 export class RoomLiveDataSourceService {
 
-  // constructor(private socket: WebSocketService) {}
+  constructor(
+    private socket: SignalRService,
+  ) {}
 
   // async getRoomById(data: WebSocketMessage) {
 
@@ -24,4 +26,19 @@ export class RoomLiveDataSourceService {
 
   // }
 
+  async addMemberToRoom(data: AddMemberToRoomInputDTO) {
+
+    const result = await this.socket.sendData({
+      method: 'AddRoomMember',
+      data: {
+        requestId: uuidv4(),
+        roomId: data.id,
+        members: data.members
+      }
+    })
+
+    console.log({result})
+
+    return result
+  }
 }
diff --git a/src/app/module/chat/data/data-source/userTyping/user-typing-local-data-source.service.ts b/src/app/module/chat/data/data-source/userTyping/user-typing-local-data-source.service.ts
index 11465010f..43661b562 100644
--- a/src/app/module/chat/data/data-source/userTyping/user-typing-local-data-source.service.ts
+++ b/src/app/module/chat/data/data-source/userTyping/user-typing-local-data-source.service.ts
@@ -12,9 +12,20 @@ import { TypingTable } from '../../../infra/database/dexie/schema/typing';
 })
 export class UserTypingLocalDataSourceService {
 
-  constructor() { }
+  constructor() { 
+    this.clear();
+  }
 
 
+  async clear() {
+    try {
+      const result = await chatDatabase.typing.clear()
+      return ok(result)
+    } catch (e) {
+      return err(false)
+    }
+  }
+
   async addUserTyping(data: TypingTable) {
 
     data.id = data.chatRoomId + '@' + data.userName
diff --git a/src/app/module/chat/data/dto/message/messageInputDtO.ts b/src/app/module/chat/data/dto/message/messageInputDtO.ts
index 56482772e..f02eb1710 100644
--- a/src/app/module/chat/data/dto/message/messageInputDtO.ts
+++ b/src/app/module/chat/data/dto/message/messageInputDtO.ts
@@ -10,14 +10,15 @@ export const MessageInputDTOSchema = z.object({
   oneShot: z.boolean(),
   requireUnlock: z.boolean(),
   requestId: z.string(),
-  attachments: z.array(z.object({
+  attachment: z.object({
     fileType: z.nativeEnum(MessageAttachmentFileType),
     source: z.nativeEnum(MessageAttachmentSource),
     file: z.string(),
     fileName: z.string(),
     applicationId: z.string(),
-    docId: z.string()
-  })).optional()
+    docId: z.string(),
+    mimeType: z.string().optional()
+  }).optional()
 });
 
 
diff --git a/src/app/module/chat/data/dto/message/messageOutputDTO.ts b/src/app/module/chat/data/dto/message/messageOutputDTO.ts
index 6d68be8bb..675bb821e 100644
--- a/src/app/module/chat/data/dto/message/messageOutputDTO.ts
+++ b/src/app/module/chat/data/dto/message/messageOutputDTO.ts
@@ -24,7 +24,6 @@ export const MessageOutPutDataDTOSchema = z.object({
   message: z.string().nullable(),
   messageType: z.number(),
   sentAt: z.string(),
-  deliverAt: z.string().datetime().nullable(),
   canEdit: z.boolean(),
   oneShot: z.boolean(),
   requireUnlock: z.boolean(),
@@ -39,10 +38,11 @@ export const MessageOutPutDataDTOSchema = z.object({
   attachments: z.array(z.object({
     fileType: z.nativeEnum(MessageAttachmentFileType),
     source: z.nativeEnum(MessageAttachmentSource),
-    file: z.string(),
-    fileName: z.string(),
+    file: z.string().optional(),
+    fileName: z.string().optional(),
     applicationId: z.string().optional(),
-    docId: z.string().optional()
+    docId: z.string().optional(),
+    id: z.string()
   }))
 });
 
diff --git a/src/app/module/chat/data/repository/message-respository.service.ts b/src/app/module/chat/data/repository/message-respository.service.ts
index 0721df706..8f2ee3462 100644
--- a/src/app/module/chat/data/repository/message-respository.service.ts
+++ b/src/app/module/chat/data/repository/message-respository.service.ts
@@ -1,7 +1,5 @@
 import { Injectable } from '@angular/core';
 import { MessageRemoteDataSourceService } from '../data-source/message/message-remote-data-source.service';
-import { MessageLiveDataSourceService } from '../data-source/message/message-live-data-source.service';
-import { MessageLocalDataSourceService } from '../data-source/message/message-local-data-source.service';
 import { SessionStore } from 'src/app/store/session.service';
 import { SignalRService } from '../../infra/socket/signal-r.service';
 import { v4 as uuidv4 } from 'uuid'
@@ -14,7 +12,10 @@ import { InstanceId } from '../../domain/chat-service.service';
 import { MessageMapper } from '../../domain/mapper/messageMapper';
 import { MessageOutPutDataDTO } from '../dto/message/messageOutputDTO';
 import { MessageTable } from 'src/app/module/chat/infra/database/dexie/schema/message';
-
+import { MessageLocalDataSourceService } from '../data-source/message/message-local-data-source.service';
+import { MessageLiveDataSourceService } from '../data-source/message/message-live-signalr-data-source.service';
+import { AttachmentLocalDataSourceService } from 'src/app/module/chat/data/data-source/attachment/message-local-data-source.service'
+import { Subject } from 'rxjs';
 
 @Injectable({
   providedIn: 'root'
@@ -25,7 +26,8 @@ export class MessageRepositoryService {
     private messageRemoteDataSourceService: MessageRemoteDataSourceService,
     private messageLiveDataSourceService: MessageLiveDataSourceService,
     private messageLiveSignalRDataSourceService: SignalRService,
-    private messageLocalDataSourceService: MessageLocalDataSourceService
+    private messageLocalDataSourceService: MessageLocalDataSourceService,
+    private AttachmentLocalDataSourceService: AttachmentLocalDataSourceService
   ) {}
 
 
@@ -37,17 +39,30 @@ export class MessageRepositoryService {
 
   }
 
-  async sendMessage(entity: MessageEntity) {
 
-    const requestId = InstanceId +'@'+ uuidv4();
+  async createMessage(entity: MessageEntity) {
+    //const requestId = InstanceId +'@'+ uuidv4();
+
+    const localActionResult = await this.messageLocalDataSourceService.sendMessage(entity)
+
+    return localActionResult.map(e => {
+      entity.$id = e
+      return entity
+    })
+  }
+
+  async sendMessage(entity: MessageEntity) {
+    const messageSubject = new Subject<MessageTable | string>();
+
     const roomId = entity.roomId
 
     entity.sending = true
     const localActionResult = await this.messageLocalDataSourceService.sendMessage(entity)
 
     if(localActionResult.isOk()) {
-      const DTO = MessageMapper.fromDomain(entity, requestId)
+      const DTO = MessageMapper.fromDomain(entity, entity.requestId)
       const sendMessageResult = await this.messageLiveSignalRDataSourceService.sendMessage<MessageOutPutDataDTO>(DTO)
+      // return this sendMessageResult
 
       if(sendMessageResult.isOk()) {
 
@@ -62,6 +77,8 @@ export class MessageRepositoryService {
           $id : localActionResult.value
         }
 
+        // console.log('sendMessageResult.value', sendMessageResult.value)
+        // this.attachment(sendMessageResult.value.attachments[0].id)
         return this.messageLocalDataSourceService.update(localActionResult.value, {...clone, sending: false, roomId: entity.roomId})
       } else {
         await this.messageLocalDataSourceService.update(localActionResult.value, {sending: false, $id: localActionResult.value})
@@ -113,12 +130,14 @@ export class MessageRepositoryService {
 
     if(result.isOk()) {
 
-      const { addedItems, changedItems } = messageListDetermineChanges(result.value.data, localResult)
+      const { addedItems, changedItems, deletedItems } = messageListDetermineChanges(result.value.data, localResult)
+
+      console.log({addedItems, changedItems});
 
       for(const message of changedItems) {
         let clone: MessageTable = message
         clone.roomId = id
-        await this.messageLocalDataSourceService.findOrUpdate(clone)
+        this.messageLocalDataSourceService.findOrUpdate(clone)
       }
 
       for(const message of addedItems) {
@@ -126,7 +145,14 @@ export class MessageRepositoryService {
         clone.roomId = id
 
       }
-      await this.messageLocalDataSourceService.createManyMessage(addedItems.reverse())
+      this.messageLocalDataSourceService.createManyMessage(addedItems.reverse())
+
+
+      for(const message of deletedItems) {
+        this.messageLocalDataSourceService.deleteByMessageId(message.id)
+      }
+      
+
     }
     return result
   }
@@ -135,6 +161,10 @@ export class MessageRepositoryService {
     return this.messageLocalDataSourceService.getItemsLive(roomId)
   }
 
+  getItems (roomId: string) {
+    return this.messageLocalDataSourceService.getItems(roomId)
+  }
+
   subscribeToNewMessages(roomId: any) {
     return this.messageLocalDataSourceService.subscribeToNewMessage(roomId)
   }
@@ -147,4 +177,9 @@ export class MessageRepositoryService {
     })
   }
 
+
+  attachment(roomId: string) {
+    console.log('attachment')
+    return this.messageRemoteDataSourceService.getAttachment(roomId)
+  }
 }
diff --git a/src/app/module/chat/data/repository/room-repository.service.ts b/src/app/module/chat/data/repository/room-repository.service.ts
index efde08418..58c5bb79a 100644
--- a/src/app/module/chat/data/repository/room-repository.service.ts
+++ b/src/app/module/chat/data/repository/room-repository.service.ts
@@ -16,6 +16,7 @@ import { MessageLiveDataSourceService } from '../data-source/message/message-liv
 import { MemberListUPdateStatusInputDTO } from '../../domain/use-case/socket/member-list-update-status-use-case.service';
 import { MemberSetAdminDTO } from '../../domain/use-case/member-admin-use-case.service';
 import { MemberListMapper } from '../../domain/mapper/memberLIstMapper';
+import { SignalRService } from '../../infra/socket/signal-r.service';
 
 
 function date(isoDateString) {
@@ -43,8 +44,7 @@ export class RoomRepositoryService {
     private roomRemoteDataSourceService: RoomRemoteDataSourceService,
     // private roomMemoryDataSourceService: Store<RoomRemoteDataSourceState>,
     private roomLocalDataSourceService: RoomLocalDataSourceService,
-    private roomLiveDataSourceService: RoomLiveDataSourceService,
-    private messageLiveDataSourceService: MessageLiveDataSourceService,
+    private roomLiveSignalRDataSourceService: RoomLiveDataSourceService,
   ) {}
 
   @captureAndReraiseAsync('RoomRepositoryService/list')
@@ -80,13 +80,13 @@ export class RoomRepositoryService {
               this.list()
             }, timeRemaining)
           }
-          
+
         }
       } catch (error) {
         console.log(error)
       }
 
-  
+
     }
     return result
   }
@@ -223,9 +223,12 @@ export class RoomRepositoryService {
 
   @captureAndReraiseAsync('RoomRepositoryService/addMemberToRoom')
   async addMemberToRoom(data: AddMemberToRoomInputDTO) {
-    const result = await this.roomRemoteDataSourceService.addMemberToRoom(data)
 
-    return result
+    return this.roomLiveSignalRDataSourceService.addMemberToRoom(data)
+
+    // const result = await this.roomRemoteDataSourceService.addMemberToRoom(data)
+
+    // return result
   }
 
   async updateMemberStatus(data: MemberListUPdateStatusInputDTO) {
diff --git a/src/app/module/chat/domain/chat-service.service.ts b/src/app/module/chat/domain/chat-service.service.ts
index a84c5796a..ece7ef4ab 100644
--- a/src/app/module/chat/domain/chat-service.service.ts
+++ b/src/app/module/chat/domain/chat-service.service.ts
@@ -9,10 +9,13 @@ import { SignalRService } from '../infra/socket/signal-r.service';
 import { SocketMessageDeleteUseCaseService } from 'src/app/module/chat/domain/use-case/socket/socket-message-delete-use-case.service';
 import { SocketMessageUpdateUseCaseService } from 'src/app/module/chat/domain/use-case/socket/socket-message-update-use-case.service';
 import { SocketMessageCreateUseCaseService } from 'src/app/module/chat/domain/use-case/socket/socket-message-create-use-case.service';
+import { ListenMessageByRoomIdNewUseCase } from 'src/app/module/chat/domain/use-case/listen-message-by-roomId.service';
 import { MemberListUpdateStatusUseCaseService } from 'src/app/module/chat/domain/use-case/socket/member-list-update-status-use-case.service';
+import { ListenMessageDeleteByRoomIdService } from './use-case/listene-message-delete-by-roomId.service';
+import { ListenMessageUpdateByRoomIdUseCase } from './use-case/listen-message-update-by-roomId.service';
+import { ListenSendMessageUseCase } from './use-case/listen-send-message.service'
 import { filter } from 'rxjs/operators';
 import { v4 as uuidv4 } from 'uuid'
-import { MessageInputDTO } from '../data/dto/message/messageInputDtO';
 import { MessageEntity } from './entity/message';
 
 export const InstanceId = uuidv4();
@@ -33,7 +36,11 @@ export class ChatServiceService {
     private SocketMessageCreateUseCaseService: SocketMessageCreateUseCaseService,
     private MemberListUpdateStatusUseCaseService: MemberListUpdateStatusUseCaseService,
     private MemberAdminUseCaseService: MemberAdminUseCaseService,
-    private MessageCreateUseCaseService: MessageCreateUseCaseService
+    private MessageCreateUseCaseService: MessageCreateUseCaseService,
+    private ListenMessageByRoomIdNewUseCase: ListenMessageByRoomIdNewUseCase,
+    private ListenMessageDeleteService: ListenMessageDeleteByRoomIdService,
+    private ListenMessageUpdateByRoomIdUseCase: ListenMessageUpdateByRoomIdUseCase,
+    private ListenSendMessageUseCase: ListenSendMessageUseCase
   ) {
     this.messageLiveSignalRDataSourceService.getMessageDelete()
     .pipe()
@@ -106,9 +113,26 @@ export class ChatServiceService {
     return this.MemberAdminUseCaseService.execute(input)
   }
 
-
   sendMessage(input: MessageEntity) {
     return this.MessageCreateUseCaseService.execute(input);
   }
+
+  listenToIncomingMessage(roomId:string) {
+    return this.ListenMessageByRoomIdNewUseCase.execute({roomId})
+  }
+
+  listenToDeleteMessage(roomId: string) {
+    return this.ListenMessageDeleteService.execute({roomId})
+  }
+
+  listenToUpdateMessage(roomId: string) {
+    return this.ListenMessageUpdateByRoomIdUseCase.execute({roomId})
+  }
+
+
+  listenToSendMessage(roomId: string) {
+    return this.ListenSendMessageUseCase.execute({roomId})
+  }
+
 }
 
diff --git a/src/app/module/chat/domain/entity/message.ts b/src/app/module/chat/domain/entity/message.ts
index 3c5df5d25..7d82d6ba5 100644
--- a/src/app/module/chat/domain/entity/message.ts
+++ b/src/app/module/chat/domain/entity/message.ts
@@ -21,11 +21,15 @@ const MessageEntitySchema = z.object({
   attachments: z.array(z.object({
     fileType: z.nativeEnum(MessageAttachmentFileType),
     source: z.nativeEnum(MessageAttachmentSource),
+    file: z.string().optional(),
+    fileName: z.string().optional(),
+    applicationId: z.string().optional(),
+    docId: z.string().optional()
+  })),
+  attachmentsSource: z.array(z.object({
     file: z.string(),
-    fileName: z.string(),
-    applicationId: z.string(),
-    docId: z.string()
-  }))
+    id: z.string(),
+  })),
 })
 
 type Message = z.infer<typeof MessageEntitySchema>;
@@ -56,8 +60,19 @@ export class MessageEntity implements Message  {
     file?: string,
     fileName: string,
     applicationId?: string,
-    docId?: string
-  }[]
+    docId?: string,
+    mimeType?: string,
+    description?: string
+  }[] = []
+
+  attachmentsSource: {
+    id: string,
+    file: string
+  }[] = []
+
+  reactions = []
+
+  requestId: string
 
   constructor() {}
 
@@ -67,4 +82,8 @@ export class MessageEntity implements Message  {
     }
   }
 
+  get hasAttachment() {
+    return this.attachments.length >= 1
+  }
+
 }
diff --git a/src/app/module/chat/domain/mapper/messageMapper.ts b/src/app/module/chat/domain/mapper/messageMapper.ts
index 861104ded..5cc2cf9e6 100644
--- a/src/app/module/chat/domain/mapper/messageMapper.ts
+++ b/src/app/module/chat/domain/mapper/messageMapper.ts
@@ -18,7 +18,7 @@ export class MessageMapper {
       roomId: entity.roomId,
       senderId: entity.sender.wxUserId,
       requestId: requestId,
-      attachments: entity.attachments
+      attachment: entity.attachments[0]
     }
   }
 }
diff --git a/src/app/module/chat/domain/use-case/listen-message-by-roomId.service.ts b/src/app/module/chat/domain/use-case/listen-message-by-roomId.service.ts
new file mode 100644
index 000000000..2f96fe5e1
--- /dev/null
+++ b/src/app/module/chat/domain/use-case/listen-message-by-roomId.service.ts
@@ -0,0 +1,24 @@
+import { Injectable } from '@angular/core';
+import { filter, map } from 'rxjs/operators';
+import { InstanceId } from '../chat-service.service';
+import { MessageLiveDataSourceService } from 'src/app/module/chat/data/data-source/message/message-live-signalr-data-source.service'
+import { MessageEntity } from '../entity/message';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ListenMessageByRoomIdNewUseCase {
+
+  constructor(
+    private MessageLiveDataSourceService: MessageLiveDataSourceService
+  ) { }
+
+  execute({roomId}: {roomId: string}) {
+
+    return this.MessageLiveDataSourceService.listenToMessages().pipe(
+      filter((message) => !message?.requestId?.startsWith(InstanceId) && message?.roomId == roomId),
+      map(message => Object.assign(new MessageEntity(), message))
+    )
+
+  }
+}
diff --git a/src/app/module/chat/domain/use-case/listen-message-update-by-roomId.service.ts b/src/app/module/chat/domain/use-case/listen-message-update-by-roomId.service.ts
new file mode 100644
index 000000000..475812ddf
--- /dev/null
+++ b/src/app/module/chat/domain/use-case/listen-message-update-by-roomId.service.ts
@@ -0,0 +1,19 @@
+import { Injectable } from '@angular/core';
+import { filter } from 'rxjs/operators';
+import { MessageLiveDataSourceService } from '../../data/data-source/message/message-live-signalr-data-source.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ListenMessageUpdateByRoomIdUseCase {
+
+  constructor(
+    private messageLiveSignalRDataSourceService: MessageLiveDataSourceService,
+  ) { }
+
+  execute({roomId}) {
+    return this.messageLiveSignalRDataSourceService.listenToUpdateMessages().pipe(
+      filter((message) => roomId == message?.roomId )
+    )
+  }
+}
diff --git a/src/app/module/chat/domain/use-case/listen-send-message.service.ts b/src/app/module/chat/domain/use-case/listen-send-message.service.ts
new file mode 100644
index 000000000..e9f2ea034
--- /dev/null
+++ b/src/app/module/chat/domain/use-case/listen-send-message.service.ts
@@ -0,0 +1,23 @@
+import { Injectable } from '@angular/core';
+import { MessageLiveDataSourceService } from 'src/app/module/chat/data/data-source/message/message-live-signalr-data-source.service'
+import { InstanceId } from '../chat-service.service';
+import { filter, map } from 'rxjs/operators';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ListenSendMessageUseCase {
+
+  constructor(
+    private MessageLiveDataSourceService: MessageLiveDataSourceService
+  ) { }
+
+  execute({roomId}: {roomId: string}) {
+
+    return this.MessageLiveDataSourceService.listenToMessages().pipe(
+      filter((message) => message?.requestId?.startsWith(InstanceId) && message?.roomId == roomId),
+      map(message => message)
+    )
+
+  }
+}
diff --git a/src/app/module/chat/domain/use-case/listene-message-delete-by-roomId.service.ts b/src/app/module/chat/domain/use-case/listene-message-delete-by-roomId.service.ts
new file mode 100644
index 000000000..a8f34df37
--- /dev/null
+++ b/src/app/module/chat/domain/use-case/listene-message-delete-by-roomId.service.ts
@@ -0,0 +1,23 @@
+import { Injectable } from '@angular/core';
+import { SignalRService } from '../../infra/socket/signal-r.service';
+import { filter } from 'rxjs/operators';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ListenMessageDeleteByRoomIdService {
+
+  constructor(
+    private messageLiveSignalRDataSourceService: SignalRService,
+  ) { }
+
+  execute({roomId}) {
+    return this.messageLiveSignalRDataSourceService.getMessageDelete().pipe(
+      filter((message) => {
+
+        console.log({message}, 'delete')
+        return roomId == message?.roomId
+      } )
+    )
+  }
+}
diff --git a/src/app/module/chat/domain/use-case/message-create-use-case.service.ts b/src/app/module/chat/domain/use-case/message-create-use-case.service.ts
index c8a367c58..37039cb03 100644
--- a/src/app/module/chat/domain/use-case/message-create-use-case.service.ts
+++ b/src/app/module/chat/domain/use-case/message-create-use-case.service.ts
@@ -3,6 +3,8 @@ import { MessageEntity } from '../entity/message';
 import { SessionStore } from 'src/app/store/session.service';
 import { MessageRepositoryService } from "src/app/module/chat/data/repository/message-respository.service"
 import { z } from 'zod';
+import { v4 as uuidv4 } from 'uuid'
+import { InstanceId } from '../chat-service.service';
 
 const MessageInputUseCaseSchema = z.object({
   memberId: z.number(),
@@ -26,6 +28,8 @@ export class MessageCreateUseCaseService {
 
     input.sendAttemp++;
 
+    input.requestId = InstanceId +'@'+ uuidv4();
+
     const result = await this.MessageRepositoryService.sendMessage(input)
 
     return result
diff --git a/src/app/module/chat/domain/use-case/message-send-use-case.service.ts b/src/app/module/chat/domain/use-case/message-send-use-case.service.ts
new file mode 100644
index 000000000..3c3405cab
--- /dev/null
+++ b/src/app/module/chat/domain/use-case/message-send-use-case.service.ts
@@ -0,0 +1,35 @@
+import { Injectable } from '@angular/core';
+import { MessageEntity } from '../entity/message';
+import { SessionStore } from 'src/app/store/session.service';
+import { MessageRepositoryService } from "src/app/module/chat/data/repository/message-respository.service"
+import { z } from 'zod';
+
+const MessageInputUseCaseSchema = z.object({
+  memberId: z.number(),
+  roomId: z.string(),
+  message: z.string()
+})
+
+export type MessageInputUseCase = z.infer< typeof MessageInputUseCaseSchema>
+
+@Injectable({
+  providedIn: 'root'
+})
+export class MessageCreateUseCaseService {
+
+  constructor(
+    private MessageRepositoryService: MessageRepositoryService
+  ) { }
+
+
+  async execute(input: MessageEntity) {
+
+    const result = await this.MessageRepositoryService.createMessage(input)
+
+    if(result.isOk()) {
+      
+    }
+
+    return result
+  }
+}
diff --git a/src/app/module/chat/domain/use-case/sync-local-message.service.ts b/src/app/module/chat/domain/use-case/sync-local-message.service.ts
deleted file mode 100644
index 918a43c7d..000000000
--- a/src/app/module/chat/domain/use-case/sync-local-message.service.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Injectable } from '@angular/core';
-import { SyncMessageRepositoryService } from 'src/app/module/chat/data/service/sync-repository/sync-message-repository.service'
-@Injectable({
-  providedIn: 'root'
-})
-export class SyncLocalMessageService {
-
-  constructor(
-    private SyncMessageRepositoryService: SyncMessageRepositoryService
-  ) { }
-
-
-  async execute() {
-    return this.SyncMessageRepositoryService.sendLocalMessages()
-  }
-}
diff --git a/src/app/module/chat/infra/database/dexie/schema/attachment.ts b/src/app/module/chat/infra/database/dexie/schema/attachment.ts
new file mode 100644
index 000000000..e88219b77
--- /dev/null
+++ b/src/app/module/chat/infra/database/dexie/schema/attachment.ts
@@ -0,0 +1,13 @@
+import { z } from "zod";
+import { EntityTable } from 'Dexie';
+
+export const AttachmentTableSchema = z.object({
+  id: z.string(),
+  $id: z.string(),
+  messageId: z.string(),
+  file: z.string(),
+})
+
+export type AttachmentTable = z.infer<typeof AttachmentTableSchema>
+export type DexieAttachmentsTableSchema = EntityTable<AttachmentTable, '$id'>;
+export const AttachmentTableColumn = '++$id, id, messageId, file'
diff --git a/src/app/module/chat/infra/database/dexie/schema/message.ts b/src/app/module/chat/infra/database/dexie/schema/message.ts
index 9eceef4ec..f84732dd0 100644
--- a/src/app/module/chat/infra/database/dexie/schema/message.ts
+++ b/src/app/module/chat/infra/database/dexie/schema/message.ts
@@ -1,5 +1,6 @@
-import { z } from "zod";
+import { nativeEnum, z } from "zod";
 import { EntityTable } from 'Dexie';
+import { MessageAttachmentFileType, MessageAttachmentSource } from "src/app/module/chat/data/dto/message/messageOutputDTO";
 
 export const MessageTable = z.object({
   $id: z.number().optional(),
@@ -25,7 +26,14 @@ export const MessageTable = z.object({
     sender: z.object({}),
   }).array().optional(),
   info: z.array(z.object({})).optional(),
-  attachments: z.array(z.object({})).optional()
+  attachments: z.array(z.object({
+    fileType: z.nativeEnum(MessageAttachmentFileType),
+    source: z.nativeEnum(MessageAttachmentSource),
+    file: z.string().optional(),
+    fileName: z.string().optional(),
+    applicationId: z.string().optional(),
+    docId: z.string().optional()
+  })).optional()
 })
 
 export type MessageTable = z.infer<typeof MessageTable>
diff --git a/src/app/module/chat/infra/database/dexie/service.ts b/src/app/module/chat/infra/database/dexie/service.ts
index 0994a9318..74dd783c0 100644
--- a/src/app/module/chat/infra/database/dexie/service.ts
+++ b/src/app/module/chat/infra/database/dexie/service.ts
@@ -5,6 +5,7 @@ import { DexieMembersTableSchema, MemberTableColumn } from './schema/members';
 import { DexieRoomsTableSchema, RoomTableColumn } from './schema/room';
 import { DexieTypingsTableSchema, TypingTableColumn } from './schema/typing';
 import { MessageEntity } from '../../../domain/entity/message';
+import { AttachmentTable, AttachmentTableColumn, DexieAttachmentsTableSchema } from './schema/attachment';
 // import DexieMemory from 'dexie-in-memory';
 
 // Database declaration (move this to its own module also)
@@ -12,14 +13,16 @@ export const chatDatabase = new Dexie('chat-database-infra') as Dexie & {
   message: DexieMessageTable,
   members: DexieMembersTableSchema,
   room: DexieRoomsTableSchema,
-  typing: DexieTypingsTableSchema
+  typing: DexieTypingsTableSchema,
+  attachment: DexieAttachmentsTableSchema,
 };
 
 chatDatabase.version(1).stores({
   message: messageTableColumn,
   members: MemberTableColumn,
   room: RoomTableColumn,
-  typing: TypingTableColumn
+  typing: TypingTableColumn,
+  attachment: AttachmentTableColumn
 });
 
 chatDatabase.message.mapToClass(MessageEntity)
diff --git a/src/app/module/chat/infra/socket/signal-r.service.ts b/src/app/module/chat/infra/socket/signal-r.service.ts
index c0e134054..6d41761b6 100644
--- a/src/app/module/chat/infra/socket/signal-r.service.ts
+++ b/src/app/module/chat/infra/socket/signal-r.service.ts
@@ -15,12 +15,12 @@ const { App } = Plugins;
 const SignalRInputSchema = z.object({
   method: z.string(),
   data: z.object({
-    requestId: z.string()
-  })
+    requestId: z.string(),
+  }).catchall(z.unknown()), // Allows any additional properties with unknown values
 })
 
 
-export type ISignalRInput = z.infer<typeof SignalRInputSchema>
+export type ISignalRInput = z.infer<typeof SignalRInputSchema>;
 
 @Injectable({
   providedIn: 'root'
@@ -92,6 +92,7 @@ export class SignalRService {
       })
 
       this.connection.getMessageDelete().subscribe((data) => {
+        console.log('delete middleware', data)
         this.messageDelete.next(data)
       })
 
diff --git a/src/app/module/chat/infra/socket/signalR.ts b/src/app/module/chat/infra/socket/signalR.ts
index cbf776680..55048d80c 100644
--- a/src/app/module/chat/infra/socket/signalR.ts
+++ b/src/app/module/chat/infra/socket/signalR.ts
@@ -306,7 +306,7 @@ export class SignalRConnection {
       console.log('DeleteMessage', _message)
       this.messageDelete.next(_message);
       this.sendDataSubject.next({
-        method: 'ReceiveMessage',
+        method: 'DeleteMessage',
         data: _message
       })
     });
diff --git a/src/app/pages/chat/messages/contacts/contacts.page.html b/src/app/pages/chat/messages/contacts/contacts.page.html
index 9f6f6a645..c703caf37 100644
--- a/src/app/pages/chat/messages/contacts/contacts.page.html
+++ b/src/app/pages/chat/messages/contacts/contacts.page.html
@@ -24,7 +24,7 @@
 </ion-header>
 
 <ion-content>
-  
+
   <ion-refresher  name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
       <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
       <ion-refresher-content>
@@ -32,8 +32,8 @@
     </ion-refresher>
   <div class="main-content">
     <ion-progress-bar class="position-absolute" type="indeterminate" *ngIf="loading"></ion-progress-bar>
-    <ion-virtual-scroll [items]="ChatSystemService.users | filter:textSearch: 'name' " approxItemHeight="70px" [headerFn]="separateLetter">
-      
+    <!-- <ion-virtual-scroll [items]="ChatSystemService.users | filter:textSearch: 'name' " approxItemHeight="70px" [headerFn]="separateLetter">
+
       <div class="item-divider" *virtualHeader="let header">
         <ion-label>{{header}}</ion-label>
       </div>
@@ -46,7 +46,7 @@
 
       </div>
 
-    </ion-virtual-scroll>
+    </ion-virtual-scroll> -->
 
   </div>
 </ion-content>
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index f17e4bf25..4b47aa8ce 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -54,14 +54,28 @@
 
       <div class="d-flex justify-content-between">
         <div>
-          {{ message.message }}
-        </div>
+          <div>
+            {{ message.message }}
+          </div>
+
+          <div *ngFor="let attachment of message.attachments">
+            <div *ngIf="attachment.fileType == 1">
+
+              <ion-icon  src="assets/icon/webtrix.svg" class="file-icon font-25"></ion-icon>
+              <ion-label>{{ attachment.fileName}}</ion-label>
+              <!-- <ion-icon *ngIf="ThemeService.currentTheme == 'default' && attachment.type != 'webtrix' && !( msg.downloadLoader == true || msg.uploadingFile == true ) " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && attachment.type != 'webtrix' && !( msg.downloadLoader == true || msg.uploadingFile == true ) " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+              <ion-icon *ngIf="( msg.downloadLoader == true || msg.uploadingFile == true )" class="icon-download" src="assets/gif/theme/{{ThemeService.currentTheme}}/Blocks-loader.svg" slot="end"></ion-icon> -->
+
+            </div>
+
+          </div>
 
         <div>
           <div class="message-item-options d-flex justify-content-end">
             <fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer"></fa-icon>
             <mat-menu #beforeMenu="matMenu" xPosition="before">
-              <button (click)="messageDelete({messageId: message.id })" class="menuButton">Apagar mensagem</button>
+              <button (click)="messageDelete(message)" class="menuButton">Apagar mensagem</button>
               <button (click)="editMessage(message)" class="menuButton">Editar mensagem</button>
               <button (click)="toggleEmojiPicker(message)" class="menuButton">Reagir mensagem</button>
             </mat-menu>
@@ -128,7 +142,7 @@
   </div>
  -->
 
-
+</div>
 </ion-content>
 
 <ion-footer>
@@ -170,26 +184,17 @@
       </div>
     </div>
     <div>
-      <button #recordbtn *ngIf="!textField && !lastAudioRecorded"
-        (click)="startRecording()" class="btn-no-color">
-        <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="chat-icon-send"
-          src="assets/icon/theme/default/icons-chat-record-audio.svg"></ion-icon>
-        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="chat-icon-send"
-          src="assets/icon/theme/gov/icons-chat-record-audio.svg"></ion-icon>
+      <button #recordbtn *ngIf="textField == '' && !lastAudioRecorded" (click)="startRecording()" class="btn-no-color">
+        <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="chat-icon-send" src="assets/icon/theme/default/icons-chat-record-audio.svg"></ion-icon>
+        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="chat-icon-send" src="assets/icon/theme/gov/icons-chat-record-audio.svg"></ion-icon>
       </button>
-      <button *ngIf="textField" class="btn-no-color" (click)="sendMessage()"
-        class="btn-no-color">
-        <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="chat-icon-send"
-          src="assets/icon/theme/gov/icons-chat-send.svg"></ion-icon>
-        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="chat-icon-send"
-          src="assets/icon/theme/gov/icons-chat-send.svg"></ion-icon>
+      <button *ngIf="textField != ''" class="btn-no-color" (click)="sendMessage()">
+        <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " class="chat-icon-send" src="assets/icon/theme/gov/icons-chat-send.svg"></ion-icon>
+        <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' " class="chat-icon-send" src="assets/icon/theme/gov/icons-chat-send.svg"></ion-icon>
       </button>
-      <button *ngIf="!textField && lastAudioRecorded"
-        (click)="sendAudio(lastAudioRecorded)" class="btn-no-color">
-        <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="chat-icon-send"
-          src="assets/icon/theme/gov/icons-chat-send.svg"></ion-icon>
-        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="chat-icon-send"
-          src="assets/icon/theme/gov/icons-chat-send.svg"></ion-icon>
+      <button *ngIf="textField == '' && lastAudioRecorded" class="btn-no-color" (click)="sendAudio(lastAudioRecorded)">
+        <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="chat-icon-send" src="assets/icon/theme/gov/icons-chat-send.svg"></ion-icon>
+        <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="chat-icon-send" src="assets/icon/theme/gov/icons-chat-send.svg"></ion-icon>
       </button>
     </div>
   </div>
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index 481a24d9f..dbbb1cf36 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -13,14 +13,11 @@ import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popo
 import { MessagesOptionsPage } from 'src/app/shared/popover/messages-options/messages-options.page';
 import { ChatMessageStore } from 'src/app/store/chat/chat-message.service';
 import { ChatUserStorage } from 'src/app/store/chat/chat-user.service';
-import { environment } from 'src/environments/environment';
 import { ThemeService } from 'src/app/services/theme.service'
 
 import { VoiceRecorder, RecordingData, GenericResponse } from 'capacitor-voice-recorder';
 import { Haptics, ImpactStyle } from '@capacitor/haptics';
 import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
-// import { ChatSystemService } from 'src/app/services/chat/chat-system.service'
-// import { MessageService } from 'src/app/services/chat/message.service';
 import { FileType } from 'src/app/models/fileType';
 import { SearchPage } from 'src/app/pages/search/search.page';
 import { Storage } from '@ionic/storage';
@@ -52,8 +49,12 @@ import { tap } from 'rxjs/operators';
 import { MessageEntity } from 'src/app/module/chat/domain/entity/message';
 import { MemberTable } from 'src/app/module/chat/infra/database/dexie/schema/members';
 import { TypingTable } from 'src/app/module/chat/infra/database/dexie/schema/typing';
-
-
+import { CameraService } from 'src/app/infra/camera/camera.service'
+import { MessageAttachmentFileType, MessageAttachmentSource } from 'src/app/module/chat/data/dto/message/messageOutputDTO';
+import { compressImageBase64 } from 'src/app/utils/imageCompressore';
+import { FilePickerService } from 'src/app/infra/file-picker/file-picker.service'
+import { FilePickerMobileService } from 'src/app/infra/file-picker/mobile/file-picker-mobile.service'
+import { AttachmentsPageRoutingModule } from '../../events/attachments/attachments-routing.module';
 
 const IMAGE_DIR = 'stored-images';
 
@@ -155,7 +156,10 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     private roomRepositoryService: RoomRepositoryService,
     private messageRepositoryService: MessageRepositoryService,
     private userTypingServiceRepository: UserTypingServiceRepository,
-    private chatServiceService: ChatServiceService
+    private chatServiceService: ChatServiceService,
+    private CameraService: CameraService,
+    private FilePickerService: FilePickerService,
+    private FilePickerMobileService: FilePickerMobileService
   ) {
 
 
@@ -439,8 +443,20 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
   }
 
   sendMessage() {
-    // this.ChatSystemService.getDmRoom(this.roomId).send({}).then(() => {
-    // })
+    const message = new MessageEntity();
+    message.message = this.textField
+    message.roomId = this.roomId
+
+    message.sender = {
+      userPhoto: '',
+      wxeMail: SessionStore.user.Email,
+      wxFullName: SessionStore.user.FullName,
+      wxUserId: SessionStore.user.UserId
+    }
+
+    this.chatServiceService.sendMessage(message)
+
+    this.textField = ''
   }
 
   /* sendMessage(msg) {
@@ -472,30 +488,26 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
 
       //Converting base64 to blob
       const encodedData = btoa(this.audioRecorded);
-      const blob = this.fileService.base64toBlob(encodedData, recordData.value.mimeType)
 
+      const message = new MessageEntity();
+      message.roomId = this.roomId
 
-      const validation = await this.FileValidatorService.validateAudioFromBlob(blob)
+      message.sender = {
+        userPhoto: '',
+        wxeMail: SessionStore.user.Email,
+        wxFullName: SessionStore.user.FullName,
+        wxUserId: SessionStore.user.UserId
+      }
 
-      const formData = new FormData();
-      formData.append("blobFile", blob);
+      message.attachments = [{
+        file: encodedData,
+        fileName: "audio",
+        source: MessageAttachmentSource.Device,
+        fileType: MessageAttachmentFileType.Audio
+      }]
+
+      this.chatServiceService.sendMessage(message)
 
-      // this.ChatSystemService.getDmRoom(roomId).send({
-      //   file: {
-      //     "type": "application/audio",
-      //     "msDuration": audioFile.value.msDuration,
-      //     "mimeType": audioFile.value.mimeType,
-      //   },
-      //   attachments: [{
-      //     "title": sanitize(fileName),
-      //     "title_link_download": true,
-      //     "type": "audio"
-      //   }],
-      //   temporaryData: formData,
-      //   attachmentsModelData: {
-      //     fileBase64: encodedData,
-      //   }
-      // })
 
     });
     this.deleteRecording();
@@ -689,51 +701,47 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
   }
 
 
-  async takePicture() {
+  async takePictureMobile() {
 
-    const roomId = this.roomId
+    const picture = await this.CameraService.takePicture({
+      cameraResultType: CameraResultType.DataUrl,
+      quality: 90
+    })
 
-    const file = await Camera.getPhoto({
-      quality: 90,
-      // allowEditing: true,
-      resultType: CameraResultType.Base64,
-      source: CameraSource.Camera
-    });
+    if(picture.isOk()) {
+      const file = picture.value
 
-    var imageBase64 = 'data:image/jpeg;base64,' + file.base64String
+      const compressedImage = await compressImageBase64(
+        file.dataUrl,
+        800, // maxWidth
+        800, // maxHeight
+        0.9  // quality
+      )
 
+      if(compressedImage.isOk()) {
 
-    const compressedImage = await this.compressImageBase64(
-      imageBase64,
-      800, // maxWidth
-      800, // maxHeight
-      0.9  // quality
-    ).then((picture) => {
-      console.log('Selected: ', picture)
-      imageBase64 = picture
-    });
+        const message = new MessageEntity();
+        message.roomId = this.roomId
 
-    //console.log(imageBase64)
-    const blob = this.dataURItoBlob(imageBase64)
+        message.sender = {
+          userPhoto: '',
+          wxeMail: SessionStore.user.Email,
+          wxFullName: SessionStore.user.FullName,
+          wxUserId: SessionStore.user.UserId
+        }
 
-    const formData = new FormData();
-    formData.append("blobFile", blob);
+        message.attachments = [{
+          file: compressedImage.value,
+          fileName: "foto",
+          source: MessageAttachmentSource.Device,
+          fileType: MessageAttachmentFileType.Image
+        }]
 
-    // this.ChatSystemService.getDmRoom(roomId).send({
-    //   file: {
-    //     "type": "application/img",
-    //     "guid": ''
-    //   },
-    //   attachments: [{
-    //     "title": "file.jpg",
-    //     "text": "description",
-    //     "title_link_download": false,
-    //   }],
-    //   temporaryData: formData,
-    //   attachmentsModelData: {
-    //     fileBase64: imageBase64,
-    //   }
-    // })
+        this.chatServiceService.sendMessage(message)
+
+      }
+
+    }
 
   }
 
@@ -762,13 +770,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
 
   }
 
-  async addImageMobile() {
-    this.addFileToChatMobile(['image/apng', 'image/jpeg', 'image/png'])
-  }
-
-  async addImage() {
-    this.addFileToChat(['image/apng', 'image/jpeg', 'image/png'])
-  }
 
   async addFile() {
     this.addFileToChat(['.doc', '.docx', '.pdf'])
@@ -791,85 +792,130 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
 
       if (data.selected) {
 
-        // this.ChatSystemService.getDmRoom(roomId).send({
-        //   file: {
-        //     "name": res.data.selected.Assunto,
-        //     "type": "application/webtrix",
-        //     "ApplicationId": res.data.selected.ApplicationType,
-        //     "DocId": res.data.selected.Id,
-        //     "Assunto": res.data.selected.Assunto,
-        //   },
-        //   temporaryData: res,
-        //   attachments: [{
-        //     "title": res.data.selected.Assunto,
-        //     "description": res.data.selected.DocTypeDesc,
-        //     // "title_link": url_no_options,
-        //     "title_link_download": true,
-        //     "thumb_url": "https://static.ichimura.ed.jp/uploads/2017/10/pdf-icon.png",
-        //     // "message_link": url_no_options,
-        //     "text": res.data.selected.DocTypeDesc,
-        //     "type": "webtrix"
-        //   }],
-        // })
+        const message = new MessageEntity();
+        message.message = this.textField
+        message.roomId = this.roomId
+
+        message.sender = {
+          userPhoto: '',
+          wxeMail: SessionStore.user.Email,
+          wxFullName: SessionStore.user.FullName,
+          wxUserId: SessionStore.user.UserId
+        }
+        message.attachments = [{
+          fileName: res.data.selected.Assunto,
+          source: MessageAttachmentSource.Webtrix,
+          fileType: MessageAttachmentFileType.Doc,
+          applicationId: res.data.selected.ApplicationType,
+          docId: res.data.selected.Id,
+        }]
+
+        this.chatServiceService.sendMessage(message)
+        this.textField = ''
 
       }
     });
   }
 
-  async addFileToChatMobile(types: typeof FileType[]) {
-    const roomId = this.roomId
+  async pickPicture() {
 
-    const file = await Camera.getPhoto({
-      quality: 90,
-      // allowEditing: true,
-      resultType: CameraResultType.Base64,
-      source: CameraSource.Photos
-    });
+    const file = await this.FilePickerService.getPicture({
+      cameraResultType: CameraResultType.Base64
+    })
 
-    //const imageData =  await this.fileToBase64Service.convert(file)
-    //
+    if(file.isOk()) {
 
-    var imageBase64 = 'data:image/jpeg;base64,' + file.base64String
+      var base64 = 'data:image/jpeg;base64,' + file.value.base64String
+      if (file.value.format == "jpeg" || file.value.format == "png" || file.value.format == "gif") {
 
+        const compressedImage = await compressImageBase64(
+          base64,
+          800, // maxWidth
+          800, // maxHeight
+          0.9  // quality
+        )
 
-    const compressedImage = await this.compressImageBase64(
-      imageBase64,
-      800, // maxWidth
-      800, // maxHeight
-      0.9  // quality
-    ).then((picture) => {
-      console.log('Selected: ', picture)
-      imageBase64 = picture
-    });
+        if(compressedImage.isOk()) {
 
-    //console.log(imageBase64)
+          const message = new MessageEntity();
+          message.roomId = this.roomId
 
-    const response = await fetch(imageBase64);
-    const blob = await response.blob();
+          message.sender = {
+            userPhoto: '',
+            wxeMail: SessionStore.user.Email,
+            wxFullName: SessionStore.user.FullName,
+            wxUserId: SessionStore.user.UserId
+          }
 
-    const formData = new FormData();
-    //console.log('add file', formData)
-    formData.append("blobFile", blob);
-    //console.log('add file', formData)
+          message.attachments = [{
+            file: compressedImage.value,
+            fileName: "foto",
+            source: MessageAttachmentSource.Device,
+            fileType: MessageAttachmentFileType.Image
+          }]
 
-    // this.ChatSystemService.getDmRoom(roomId).send({
-    //   file: {
-    //     "type": "application/img",
-    //     "guid": ''
-    //   },
-    //   temporaryData: formData,
-    //   attachments: [{
-    //     "title": file.path,
-    //     "text": "description",
-    //     "title_link_download": false,
-    //   }],
-    //   attachmentsModelData: {
-    //     fileBase64: imageBase64,
-    //   }
-    // })
+          this.chatServiceService.sendMessage(message)
+        }
+    }
+
+    }
 
   }
 
+  // async addFileToChatMobile() {
+  //   const roomId = this.roomId
+
+  //   const file = await Camera.getPhoto({
+  //     quality: 90,
+  //     // allowEditing: true,
+  //     resultType: CameraResultType.Base64,
+  //     source: CameraSource.Photos
+  //   });
+
+  //   //const imageData =  await this.fileToBase64Service.convert(file)
+  //   //
+
+  //   var imageBase64 = 'data:image/jpeg;base64,' + file.base64String
+
+
+  //   const compressedImage = await this.compressImageBase64(
+  //     imageBase64,
+  //     800, // maxWidth
+  //     800, // maxHeight
+  //     0.9  // quality
+  //   ).then((picture) => {
+  //     console.log('Selected: ', picture)
+  //     imageBase64 = picture
+  //   });
+
+  //   //console.log(imageBase64)
+
+  //   const response = await fetch(imageBase64);
+  //   const blob = await response.blob();
+
+  //   const formData = new FormData();
+  //   //console.log('add file', formData)
+  //   formData.append("blobFile", blob);
+  //   //console.log('add file', formData)
+
+  //   // this.ChatSystemService.getDmRoom(roomId).send({
+  //   //   file: {
+  //   //     "type": "application/img",
+  //   //     "guid": ''
+  //   //   },
+  //   //   temporaryData: formData,
+  //   //   attachments: [{
+  //   //     "title": file.path,
+  //   //     "text": "description",
+  //   //     "title_link_download": false,
+  //   //   }],
+  //   //   attachmentsModelData: {
+  //   //     fileBase64: imageBase64,
+  //   //   }
+  //   // })
+
+  // }
+
   getFileReader(): FileReader {
     const fileReader = new FileReader();
     const zoneOriginalInstance = (fileReader as any)["__zone_symbol__originalInstance"];
@@ -890,7 +936,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     })
   }
 
-  async addFileToChat(types: typeof FileType[]) {
+  async addFileToChat(types) {
     console.log('add file ')
     const roomId = this.roomId
 
@@ -906,29 +952,25 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
 
       console.log('RESULT', resultt.files[0].data)
 
-      const blobb = this.fileService.base64toBlob(resultt.files[0].data, resultt.files[0].mimeType)
-      const blob = new Blob([resultt.files[0].data], {type: resultt.files[0].mimeType});
+      const message = new MessageEntity();
+      message.roomId = this.roomId
 
-      const formDataa = new FormData();
-      formDataa.append('blobFile', blobb);
-      /*  console.log('add file', fileBase64) */
+      message.sender = {
+        userPhoto: '',
+        wxeMail: SessionStore.user.Email,
+        wxFullName: SessionStore.user.FullName,
+        wxUserId: SessionStore.user.UserId
+      }
+
+      message.attachments = [{
+        file: resultt.files[0].data,
+        fileName: resultt.files[0].name,
+        source: MessageAttachmentSource.Device,
+        fileType: MessageAttachmentFileType.Doc
+      }]
+
+      this.chatServiceService.sendMessage(message)
 
-      // this.ChatSystemService.getDmRoom(roomId).send({
-      //   file: {
-      //     "type": resultt.files[0].mimeType,
-      //     "guid": '',
-      //   },
-      //   attachments: [{
-      //     "title": sanitize(resultt.files[0].name),
-      //     "name": sanitize(resultt.files[0].name),
-      //     // "text": "description",
-      //     "title_link_download": false,
-      //   }],
-      //   temporaryData: formDataa,
-      //   attachmentsModelData: {
-      //     fileBase64: '',
-      //   }
-      // })
       return
 
     }
@@ -937,17 +979,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     console.log(file)
 
 
-    /* const encodedData = btoa(JSON.stringify(await this.getBase64(file).catch ((error) => {
-        console.error(error);
-      })));
-      const blob = this.fileService.base64toBlob(encodedData, file.type)
-
-      const fileBase64 = await this._getBase64(file)
-
-      const formData = new FormData();
-      formData.append('blobFile', blob);
-      console.log('add file', fileBase64) */
-
     const fileName = file.name
 
     const validation = this.FileValidatorService.fileNameValidation(fileName)
@@ -962,24 +993,27 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
 
       const formData = new FormData();
       formData.append('blobFile', blob);
-      /*  console.log('add file', fileBase64) */
 
-      // this.ChatSystemService.getDmRoom(roomId).send({
-      //   file: {
-      //     "type": file.type,
-      //     "guid": '',
-      //   },
-      //   attachments: [{
-      //     "title": sanitize(fileName),
-      //     "name": sanitize(fileName),
-      //     // "text": "description",
-      //     "title_link_download": false,
-      //   }],
-      //   temporaryData: formData,
-      //   attachmentsModelData: {
-      //     fileBase64: encodedData,
-      //   }
-      // });
+
+      const message = new MessageEntity();
+      message.roomId = this.roomId
+
+      message.sender = {
+        userPhoto: '',
+        wxeMail: SessionStore.user.Email,
+        wxFullName: SessionStore.user.FullName,
+        wxUserId: SessionStore.user.UserId
+      }
+
+      message.attachments = [{
+        file: encodedData,
+        fileName: "doc",
+        source: MessageAttachmentSource.Device,
+        fileType: MessageAttachmentFileType.Doc
+      }]
+
+      this.chatServiceService.sendMessage(message)
+
     } else {
       this.toastService._badRequest("Ficheiro inválido")
     }
@@ -1022,11 +1056,11 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
         this.bookMeeting();
       }
       else if (res['data'] == 'take-picture') {
-        this.takePicture()
+        this.takePictureMobile()
       }
       else if (res['data'] == 'add-picture') {
         console.log('add-picture')
-        this.addImageMobile()
+        this.pickPicture()
       }
       else if (res['data'] == 'add-document') {
         this.addFile()
@@ -1447,6 +1481,3 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     this.userTypingServiceRepository.addUserTyping(this.roomId)
   }
 }
-
-
-
diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
index 401da6820..51ca17c0a 100644
--- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
+++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
@@ -1,6 +1,5 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { ThemeService } from 'src/app/services/theme.service'
-// import { ChatSystemService } from 'src/app/services/chat/chat-system.service';
 import { ContactRepositoryService } from 'src/app/services/Repositorys/contacts/repository/contacts-repository.service';
 import { UserContacts } from 'src/app/services/Repositorys/contacts/data-source/contacts-data-source.service';
 import { RoomRepositoryService } from 'src/app/module/chat/data/repository/room-repository.service'
@@ -26,7 +25,6 @@ export class GroupContactsPage implements OnInit {
   @Output() openGroupMessage:EventEmitter<any> = new EventEmitter<any>();
   @Output() openGroupContacts:EventEmitter<any> = new EventEmitter<any>();
 
-
   currentMembers:UserContacts[];
   allChatUsers: UserContacts[]  = [];
   userContainer: {[key: string]: ( UserContacts & {isChecked: boolean})[] } = {}
@@ -59,13 +57,13 @@ export class GroupContactsPage implements OnInit {
         id: this.roomId,
         members: this.selectedUsers
       })
-      if(addMembers.isOk()) {
-        // this.addContacts(this.roomId);
-        this.openGroupMessage.emit(this.roomId);
-        this.RoomRepositoryService.getRoomById(this.roomId)
-      } else if(addMembers.error instanceof HttpRequest) {
-        this.httpErrorHandle.httpStatusHandle(addMembers.error)
-      }
+      // if(addMembers.isOk()) {
+      //   // this.addContacts(this.roomId);
+      //   this.openGroupMessage.emit(this.roomId);
+      //   this.RoomRepositoryService.getRoomById(this.roomId)
+      // } else if(addMembers.error instanceof HttpRequest) {
+      //   this.httpErrorHandle.httpStatusHandle(addMembers.error)
+      // }
     } else {
       this.openGroupMessage.emit(this.roomId);
     }
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index bd8dcb336..c29e25774 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -3,7 +3,7 @@
     <div class="main-header">
       <div class="header-top">
         <div class="middle">
-          <ion-label class="title">{{ ChatSystemService.getGroupRoom(roomId).name.split('-').join(' ') }}</ion-label>
+          <!-- <ion-label class="title">{{ ChatSystemService.getGroupRoom(roomId).name.split('-').join(' ') }}</ion-label> -->
         </div>
         <div class="right">
           <!-- <div (click)=" ChatSystemService.getGroupRoom(this.roomId).deleteAll()">delete all</div> -->
@@ -18,11 +18,11 @@
           <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/icon/icons-user.svg"></ion-icon>
           <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/icon/theme/gov/icons-user.svg"></ion-icon>
         </div>
-        <div class="header-bottom-contacts" *ngIf="ChatSystemService.getGroupRoom(roomId)">
+        <!-- <div class="header-bottom-contacts" *ngIf="ChatSystemService.getGroupRoom(roomId)">
           <ion-label class="contacts-list" *ngFor="let member of ChatSystemService.getGroupRoom(roomId).membersExcludeMe; let last = last" >
             {{member.name}}<span *ngIf="!last">, </span>
           </ion-label>
-        </div>
+        </div> -->
       </div>
 
     </div>
@@ -42,7 +42,7 @@
       <ion-label>A conversa original mantêm-se como chat individual</ion-label>
     </div>
 
-    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of ChatSystemService.getGroupRoom(roomId).messages; let last = last">
+    <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of []; let last = last">
       <div class="message-item incoming-{{msg.u.username!=sessionStore.user.UserName}} max-width-45" *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'au' && msg.t != 'ru' && msg.msg !=''" [class.dateLabel]="msg.dateLabel">
         <div class="message-item-options d-flex justify-content-end" *ngIf="!msg.dateLabel">
           <fa-icon [matMenuTriggerFor]="beforeMenu" icon="chevron-down" class="message-options-icon cursor-pointer"></fa-icon>
@@ -213,7 +213,7 @@
         {{last ? scrollToBottom() : ''}}
       </div>
       <div *ngIf="msg.t == 'au' && msg.msg != sessionStore.user.UserName">
-        <div *ngFor="let user of ChatSystemService.users">
+        <div *ngFor="let user of []">
           <div *ngIf="msg.msg == user.username" class="info-text-leave">
             <ion-label>Adicionou {{user.name}}</ion-label><br />
           </div>
@@ -252,15 +252,15 @@
 
 <ion-footer>
 
-  <div class="typing" *ngIf="ChatSystemService.getGroupRoom(roomId).otherUserType == true">
 
-    <ngx-letters-avatar *ngIf="showAvatar"
+    <!--   <div class="typing" >
+<ngx-letters-avatar *ngIf="showAvatar"
     [avatarName]=  "ChatSystemService.getGroupRoom(roomId).name"
     [width]="30"
     [circular]="true"
     fontFamily="Roboto"></ngx-letters-avatar>
     {{ ChatSystemService.getGroupRoom(roomId).userThatIsTyping }} está a escrever...
-  </div>
+  </div> -->
 
   <div class="width-100 pl-20 pr-20">
     <span *ngIf="!lastAudioRecorded">{{durationDisplay}}</span>
@@ -298,7 +298,7 @@
 
     <div class="width-100">
       <div *ngIf="!recording && !lastAudioRecorded" class="type-message">
-        <ion-textarea autocomplete="on" autocorrect="on" spellcheck="true" (keyup.enter)="sendMessage()" clearOnEdit="true" placeholder="Escrever uma mensagem" class="message-input" rows="1" [(ngModel)]="ChatSystemService.getGroupRoom(roomId).message" (ionChange)="ChatSystemService.getGroupRoom(roomId).sendTyping()"></ion-textarea>
+        <ion-textarea autocomplete="on" autocorrect="on" spellcheck="true" (keyup.enter)="sendMessage()" clearOnEdit="true" placeholder="Escrever uma mensagem" class="message-input" rows="1" ></ion-textarea>
       </div>
       <div *ngIf="recording" class="d-flex align-items-center justify-content-center">
         <button (click)="stopRecording()" class="btn-no-color d-flex align-items-center justify-content-center">
@@ -307,7 +307,7 @@
       </div>
     </div>
 
-    <div class="btn-send">
+    <!-- <div class="btn-send">
       <button #recordbtn *ngIf="!ChatSystemService.getGroupRoom(roomId).message && !lastAudioRecorded" (click)="startRecording()" class="btn-no-color">
         <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="chat-icon-send" src="assets/icon/theme/default/icons-chat-record-audio.svg"></ion-icon>
         <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="chat-icon-send" src="assets/icon/theme/gov/icons-chat-record-audio.svg"></ion-icon>
@@ -320,7 +320,7 @@
         <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="chat-icon-send" src="assets/icon/theme/gov/icons-chat-send.svg"></ion-icon>
         <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="chat-icon-send" src="assets/icon/theme/gov/icons-chat-send.svg"></ion-icon>
       </button>
-    </div>
+    </div> -->
   </div>
 </ion-footer>
 
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 028fd08e9..4dd35de41 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -44,14 +44,30 @@
   <div class="messages height-100 width-100 d-flex flex-column" #scrollMe >
 
     <div
-    *ngFor="let message of (roomMessage$ | async)" class="messages-list-item-wrapper"
+    *ngFor="let message of messages1[roomId]" class="messages-list-item-wrapper"
     [ngClass]="{'my-message': message.sender.wxUserId === sessionStore.user.UserId, 'other-message': message.sender.wxUserId !== sessionStore.user.UserId}"
     >
     <div class="message-container">
 
       <div class="d-flex justify-content-between">
         <div>
-          {{ message.message }}
+          <div>
+            {{ message.message }}
+          </div>
+
+          <div *ngFor="let attachment of message.attachment">
+            <div *ngIf="attachment.fileType == 1">
+
+              <ion-icon  src="assets/icon/webtrix.svg" class="file-icon font-25"></ion-icon>
+              <ion-label>{{ attachment.fileName}}</ion-label>
+              <!-- <ion-icon *ngIf="ThemeService.currentTheme == 'default' && attachment.type != 'webtrix' && !( msg.downloadLoader == true || msg.uploadingFile == true ) " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
+              <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && attachment.type != 'webtrix' && !( msg.downloadLoader == true || msg.uploadingFile == true ) " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
+              <ion-icon *ngIf="( msg.downloadLoader == true || msg.uploadingFile == true )" class="icon-download" src="assets/gif/theme/{{ThemeService.currentTheme}}/Blocks-loader.svg" slot="end"></ion-icon> -->
+
+            </div>
+
+          </div>
+
         </div>
 
         <div>
diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts
index 699aae4ce..363229920 100644
--- a/src/app/shared/chat/messages/messages.page.ts
+++ b/src/app/shared/chat/messages/messages.page.ts
@@ -1,8 +1,6 @@
-import { AfterViewInit, Component, ElementRef, EventEmitter, HostListener, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core';
+import { AfterViewInit, Component, ElementRef, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core';
 import { AnimationController, GestureController, IonRange, ModalController, PopoverController } from '@ionic/angular';
 import { ToastService } from 'src/app/services/toast.service';
-import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popover/chat-options-popover.page';
-import { MessagesOptionsPage } from 'src/app/shared/popover/messages-options/messages-options.page';
 import { ContactsPage } from '../new-group/contacts/contacts.page';
 import { ChatOptionsFeaturesPage } from 'src/app/modals/chat-options-features/chat-options-features.page';
 import { ChatMessageStore } from 'src/app/store/chat/chat-message.service';
@@ -12,12 +10,10 @@ import { FileService } from 'src/app/services/functions/file.service';
 import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
 import { ThemeService } from 'src/app/services/theme.service';
 import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
-import { Storage } from '@ionic/storage';
 import { FileType } from 'src/app/models/fileType';
 import { SearchPage } from 'src/app/pages/search/search.page';
-import { Camera, CameraResultType, CameraSource } from '@capacitor/camera';
-import { DocumentViewer, DocumentViewerOptions } from '@ionic-native/document-viewer';
-import { VoiceRecorder, RecordingData, GenericResponse } from 'capacitor-voice-recorder';
+import { CameraResultType } from '@capacitor/camera';
+import { RecordingData } from 'capacitor-voice-recorder';
 import { Filesystem, Directory } from '@capacitor/filesystem';
 import { DomSanitizer } from '@angular/platform-browser';
 import { Platform } from '@ionic/angular';
@@ -29,7 +25,7 @@ import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
 import { PermissionService } from 'src/app/services/permission.service';
 import { ChatPopoverPage } from '../../popover/chat-popover/chat-popover.page';
 import { Observable as  DexieObservable } from 'Dexie';
-import { Observable, Subscription } from 'rxjs';
+import { Subscription } from 'rxjs';
 import { MessageRepositoryService } from 'src/app/module/chat/data/repository/message-respository.service'
 import { RoomRepositoryService } from 'src/app/module/chat/data/repository/room-repository.service'
 import { MessageTable } from 'src/app/module/chat/infra/database/dexie/schema/message';
@@ -45,9 +41,10 @@ import { JSFileToBase64 } from 'src/app/utils/ToBase64';
 import { CameraService } from 'src/app/infra/camera/camera.service'
 import { compressImageBase64 } from '../../../utils/imageCompressore';
 import { FilePickerWebService } from 'src/app/infra/file-picker/web/file-picker-web.service'
+import { FilePickerService } from 'src/app/infra/file-picker/file-picker.service'
 import { allowedDocExtension } from 'src/app/utils/allowedDocExtension';
 import { SpeakerService, StartRecordingResultError, StopRecordingResultError } from 'src/app/infra/speaker/speaker.service'
-const IMAGE_DIR = 'stored-images';
+
 @Component({
   selector: 'app-messages',
   templateUrl: './messages.page.html',
@@ -59,7 +56,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   @ViewChild('scrollMe') private myScrollContainer: ElementRef;
   @ViewChild('message-item') messageContainer: ElementRef;
 
-  messages: any;
   dm: any;
   userPresence = '';
   dmUsers: any;
@@ -116,6 +112,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   roomName: any;
   isAdmin = true;
   roomCountDownDate: string;
+  audioMimeType = ''
 
   textField = ''
 
@@ -132,18 +129,24 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   totalMessage = 0
   recordData:RecordingData
 
+  messages: MessageEntity[] = []
+
+  messageReceiveSubject: Subscription
+  messageDeleteSubject: Subscription
+  messageUpdateSubject: Subscription
+  messageSendSubject: Subscription
+
+  messages1: {[key: string]: MessageEntity[]} = {}
+
   constructor(
     public popoverController: PopoverController,
     private modalController: ModalController,
-    /* private navParams: NavParams, */
     private animationController: AnimationController,
     private toastService: ToastService,
     private timeService: TimeService,
     private fileService: FileService,
     private gestureController: GestureController,
     public ThemeService: ThemeService,
-    private storage: Storage,
-    // public RochetChatConnectorService: RochetChatConnectorService,
     private sanitiser: DomSanitizer,
     private file: File,
     private platform: Platform,
@@ -155,6 +158,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     private chatServiceService: ChatServiceService,
     private CameraService: CameraService,
     private FilePickerWebService: FilePickerWebService,
+    private FilePickerService: FilePickerService,
     private SpeakerService: SpeakerService
   ) {
     // update
@@ -163,9 +167,13 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
 
   ngOnChanges(changes: SimpleChanges): void {
     this.roomData$ = this.roomRepositoryService.getItemByIdLive(this.roomId)
+    this.getMessages()
+    this.listenToIncomingMessage()
+    this.listenToDeleteMessage()
+    this.listenToUpdateMessage();
+    this.listenToSendMessage()
 
     this.roomMessage$ = this.messageRepositoryService.getItemsLive(this.roomId)
-
     this.roomMembers$ = this.roomRepositoryService.getRoomMemberByIdLive(this.roomId) as any
     this.roomStatus$ = this.roomRepositoryService.getRoomStatus(this.roomId)
     this.roomRepositoryService.getRoomById(this.roomId)
@@ -179,25 +187,77 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
 
       (this.myInputRef.nativeElement as HTMLDivElement).innerHTML = '::'+ uniqueArray
     })
+  }
 
-    this.newMessagesStream?.unsubscribe()
-    this.newMessagesStream = this.messageRepositoryService.subscribeToNewMessages(this.roomId).subscribe((e) => {
+  async getMessages() {
+    this.messages1[this.roomId] = []
 
-      setTimeout(() => {
-        this.scrollToBottomClicked()
-      }, 200)
+    const messages = await this.messageRepositoryService.getItems(this.roomId)
+    this.messages1[this.roomId].unshift(...messages)
+  }
 
-      setTimeout(() => {
-        this.scrollToBottomClicked()
-      }, 500)
+  listenToIncomingMessage() {
+    this.messageReceiveSubject?.unsubscribe();
+    this.messageReceiveSubject = this.chatServiceService.listenToIncomingMessage(this.roomId).subscribe((message) => {
+      this.messages1[this.roomId].push(message as MessageEntity)
+      this.scrollToBottomClicked()
+    });
+  }
 
-    })
+  listenToDeleteMessage() {
+    this.messageDeleteSubject?.unsubscribe();
 
-    //this.userTyping$ = this.userTypingMemoryDataSource.select(state => state) as any
+    this.messageDeleteSubject = this.chatServiceService.listenToDeleteMessage(this.roomId).subscribe((deleteMessage) => {
+      console.log('delete class', deleteMessage);
 
-    // let a = this.userTypingMemoryDataSource.select(state => state).subscribe((e) => {
-    //   this.userTyping$ = e as any
-    // })
+      const index = this.messages1[this.roomId].findIndex(e => e?.id === deleteMessage.id); // Use triple equals for comparison
+
+      if (index !== -1) { // Check if the item was found
+        console.log('delete ==')
+        this.messages1[this.roomId].splice(index, 1);
+        // console.log('removed index', index);
+      } else {
+        // console.log('message not found');
+      }
+    });
+  }
+
+  listenToUpdateMessage() {
+    this.messageUpdateSubject?.unsubscribe();
+
+    this.messageUpdateSubject = this.chatServiceService.listenToUpdateMessage(this.roomId).subscribe((updateMessage) => {
+      console.log('update message', updateMessage);
+
+      const index = this.messages1[this.roomId].findIndex(e => e?.id === updateMessage.id); // Use triple equals for comparison
+
+      if (index !== -1) { // Check if the item was found
+        console.log('update ==')
+        this.messages1[this.roomId][index].message = updateMessage.message
+        this.messages1[this.roomId][index].reactions = updateMessage.reactions
+      } else {
+        // console.log('message not found');
+      }
+    });
+  }
+
+
+  listenToSendMessage() {
+    this.messageSendSubject?.unsubscribe();
+
+    this.messageSendSubject = this.chatServiceService.listenToSendMessage(this.roomId).subscribe((updateMessage) => {
+      console.log('update message', updateMessage);
+
+      const index = this.messages1[this.roomId].findIndex(e => e?.requestId === updateMessage.requestId); // Use triple equals for comparison
+
+      if (index !== -1) { // Check if the item was found
+        console.log('update ==')
+
+        this.messages1[this.roomId][index].id = updateMessage.id
+
+      } else {
+        // console.log('message not found');
+      }
+    });
   }
 
 
@@ -409,9 +469,9 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
       this.recording = false;
       const recordData = stop.value
       this.recordData = recordData
+      this.audioMimeType = recordData.value.mimeType
       if (recordData.value.recordDataBase64.includes('data:audio')) {
         console.log({recordData})
-
         this.audioRecordedDataUrl = recordData.value.recordDataBase64
         this.audioRecordedSafe = this.sanitiser.bypassSecurityTrustResourceUrl(recordData.value.recordDataBase64);
       }
@@ -448,11 +508,16 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
       file: encodedData,
       fileName: "audio",
       source: MessageAttachmentSource.Device,
-      fileType: MessageAttachmentFileType.Audio
+      fileType: MessageAttachmentFileType.Audio,
+      mimeType: this.audioMimeType
+
     }]
 
     this.chatServiceService.sendMessage(message)
-
+    this.messages1[this.roomId].push(message)
+    setTimeout(() => {
+      this.scrollToBottomClicked()
+    }, 100)
 
     this.deleteRecording();
   }
@@ -490,7 +555,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     await modal.present();
   }
 
-  sendMessage() {
+  async sendMessage() {
 
     const message = new MessageEntity();
     message.message = this.textField
@@ -503,9 +568,16 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
       wxUserId: SessionStore.user.UserId
     }
 
-    this.chatServiceService.sendMessage(message)
-
     this.textField = ''
+    this.messages1[this.roomId].push(message)
+    setTimeout(() => {
+      this.scrollToBottomClicked()
+    }, 100)
+    const data = await this.chatServiceService.sendMessage(message)
+    
+
+    console.log({data})
+
   }
 
 
@@ -676,9 +748,14 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
           file: compressedImage.value,
           fileName: "foto",
           source: MessageAttachmentSource.Device,
-          fileType: MessageAttachmentFileType.Image
+          fileType: MessageAttachmentFileType.Image,
+          mimeType: picture.value.format
         }]
 
+        this.messages1[this.roomId].push(message)
+        setTimeout(() => {
+          this.scrollToBottomClicked()
+        }, 100)
         this.chatServiceService.sendMessage(message)
 
       }
@@ -729,6 +806,10 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
           docId: res.data.selected.Id,
         }]
 
+        this.messages1[this.roomId].push(message)
+        setTimeout(() => {
+          this.scrollToBottomClicked()
+        }, 100)
         this.chatServiceService.sendMessage(message)
         this.textField = ''
 
@@ -740,7 +821,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
 
   async pickPicture() {
 
-    const file = await this.FilePickerWebService.getPicture({
+    const file = await this.FilePickerService.getPicture({
       cameraResultType: CameraResultType.Base64
     })
 
@@ -769,12 +850,19 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
           }
 
           message.attachments = [{
-            file: compressedImage.value,
+            file: file.value.base64String,
             fileName: "foto",
             source: MessageAttachmentSource.Device,
-            fileType: MessageAttachmentFileType.Image
+            fileType: MessageAttachmentFileType.Image,
+            mimeType: 'image/'+file.value.format,
+            description: ''
+
           }]
 
+          this.messages1[this.roomId].push(message)
+          setTimeout(() => {
+            this.scrollToBottomClicked()
+          }, 100)
           this.chatServiceService.sendMessage(message)
         }
     }
@@ -821,9 +909,14 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
             file: fileBase64.value,
             fileName: file.value.name,
             source: MessageAttachmentSource.Device,
-            fileType: MessageAttachmentFileType.Doc
+            fileType: MessageAttachmentFileType.Doc,
+            mimeType: file.value.type
           }]
 
+          this.messages1[this.roomId].push(message)
+          setTimeout(() => {
+            this.scrollToBottomClicked()
+          }, 100)
           this.chatServiceService.sendMessage(message)
         }
 
diff --git a/typedoc.json b/typedoc.json
index 625464866..0468b695d 100644
--- a/typedoc.json
+++ b/typedoc.json
@@ -1,7 +1,11 @@
 {
   // Comments are supported, like tsconfig.json
   "entryPoints": [
-    "./src/app/utils/*.ts"
+    "./src/app/utils/*.ts",
+    "./src/app/infra/camera/*.ts",
+    "./src/app/infra/**/*.ts",
+    "./src/app/module/**/*.ts",
+    //"./src/app/infra/repository/dexie/dexie-repository.service.ts",
   ] ,
-  "out": "doc/TypeDoc"
+  "out": "doc/TypeDoc",
 }