From 449751a89193102db43ee21aaeb41e26503886b5 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 23 Mar 2022 16:55:04 +1100
Subject: [PATCH] remove some refs to Signal.Data in ts

---
 js/views/session_registration_view.js       |  7 -------
 ts/components/dialog/DeleteAccountModal.tsx | 10 ++++++----
 ts/util/expiringMessages.ts                 |  6 ++++--
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/js/views/session_registration_view.js b/js/views/session_registration_view.js
index 8fa51f5da..98b33852f 100644
--- a/js/views/session_registration_view.js
+++ b/js/views/session_registration_view.js
@@ -31,13 +31,6 @@
       window.log.info(s);
       this.$('#status').text(s);
     },
-    displayError(error) {
-      this.$('#error')
-        .hide()
-        .text(error)
-        .addClass('in')
-        .fadeIn();
-    },
   });
 
   class TextScramble {
diff --git a/ts/components/dialog/DeleteAccountModal.tsx b/ts/components/dialog/DeleteAccountModal.tsx
index cf35c6b9a..74adedfed 100644
--- a/ts/components/dialog/DeleteAccountModal.tsx
+++ b/ts/components/dialog/DeleteAccountModal.tsx
@@ -10,14 +10,16 @@ import { SessionHtmlRenderer } from '../basic/SessionHTMLRenderer';
 import { SessionSpinner } from '../basic/SessionSpinner';
 import { SessionWrapperModal } from '../SessionWrapperModal';
 
+import * as Data from '../../data/data';
+
 const deleteDbLocally = async () => {
   window?.log?.info('last message sent successfully. Deleting everything');
   window.persistStore?.purge();
   await window.Signal.Logs.deleteAll();
-  await window.Signal.Data.removeAll();
-  await window.Signal.Data.close();
-  await window.Signal.Data.removeDB();
-  await window.Signal.Data.removeOtherData();
+  await Data.removeAll();
+  await Data.close();
+  await Data.removeDB();
+  await Data.removeOtherData();
   window.localStorage.setItem('restart-reason', 'delete-account');
 };
 
diff --git a/ts/util/expiringMessages.ts b/ts/util/expiringMessages.ts
index 04b2a9f4f..c36e95e4b 100644
--- a/ts/util/expiringMessages.ts
+++ b/ts/util/expiringMessages.ts
@@ -51,14 +51,16 @@ async function destroyExpiredMessages() {
 let timeout: NodeJS.Timeout | undefined;
 async function checkExpiringMessages() {
   // Look up the next expiring message and set a timer to destroy it
-  const messages = await window.Signal.Data.getNextExpiringMessage();
+  const messages = await Data.getNextExpiringMessage();
   const next = messages.at(0);
   if (!next) {
     return;
   }
 
   const expiresAt = next.get('expires_at');
-
+  if (!expiresAt) {
+    return;
+  }
   window.log.info('next message expires', new Date(expiresAt).toISOString());
   window.log.info('next message expires in ', (expiresAt - Date.now()) / 1000);