From 76258f546202bb933747ed5c44fad7ae92da0337 Mon Sep 17 00:00:00 2001
From: Mo Bitar <me@bitar.io>
Date: Fri, 12 Nov 2021 12:21:04 -0600
Subject: [PATCH] fix: component expiration for custom extensions

---
 .../components/ComponentView/IsExpired.tsx       |  2 +-
 .../components/ComponentView/index.tsx           | 16 ++++++++--------
 package.json                                     |  4 ++--
 yarn.lock                                        |  8 ++++----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/assets/javascripts/components/ComponentView/IsExpired.tsx b/app/assets/javascripts/components/ComponentView/IsExpired.tsx
index 31d1faa1f..18acde9b7 100644
--- a/app/assets/javascripts/components/ComponentView/IsExpired.tsx
+++ b/app/assets/javascripts/components/ComponentView/IsExpired.tsx
@@ -25,7 +25,7 @@ export const IsExpired: FunctionalComponent<IProps> = ({
                   rel={'noopener'}
                   target={'_blank'}
                 >
-                  Your Extended subscription expired on {expiredDate}
+                  Your subscription expired on {expiredDate}
                 </a>
                 <div className={'sk-p'}>
                   Extensions are in a read-only state.
diff --git a/app/assets/javascripts/components/ComponentView/index.tsx b/app/assets/javascripts/components/ComponentView/index.tsx
index e1670d4ee..39f225f16 100644
--- a/app/assets/javascripts/components/ComponentView/index.tsx
+++ b/app/assets/javascripts/components/ComponentView/index.tsx
@@ -82,12 +82,12 @@ export const ComponentView: FunctionalComponent<IProps> = observer(
         }
       }();
 
-      setIsExpired(component.valid_until && component.valid_until <= new Date());
+      setIsExpired(component.isExpired);
 
-      const readonlyState = application.componentManager!.getReadonlyStateForComponent(component);
+      const readonlyState = application.componentManager.getReadonlyStateForComponent(component);
 
       if (!readonlyState.lockReadonly) {
-        application.componentManager!.setReadonlyStateForComponent(component, isExpired);
+        application.componentManager.setReadonlyStateForComponent(component, isExpired);
       }
       setIsComponentValid(!offlineRestricted && !hasUrlError);
 
@@ -155,7 +155,7 @@ export const ComponentView: FunctionalComponent<IProps> = observer(
         }
       }
       clearTimeout(loadTimeout);
-      await application.componentManager!.registerComponentWindow(
+      await application.componentManager.registerComponentWindow(
         component,
         iframe.contentWindow!
       );
@@ -198,7 +198,7 @@ export const ComponentView: FunctionalComponent<IProps> = observer(
           return;
         }
 
-        const iframe = application.componentManager!.iframeForComponent(
+        const iframe = application.componentManager.iframeForComponent(
           component.uuid
         );
         if (!iframe) {
@@ -218,7 +218,7 @@ export const ComponentView: FunctionalComponent<IProps> = observer(
     const expiredDate = isExpired ? component.dateToLocalizedString(component.valid_until) : '';
 
     const getUrl = () => {
-      const url = component ? application.componentManager!.urlForComponent(component) : '';
+      const url = component ? application.componentManager.urlForComponent(component) : '';
       return url as string;
     };
 
@@ -265,13 +265,13 @@ export const ComponentView: FunctionalComponent<IProps> = observer(
         return;
       }
 
-      const unregisterComponentHandler = application.componentManager!.registerHandler({
+      const unregisterComponentHandler = application.componentManager.registerHandler({
         identifier: 'component-view-' + Math.random(),
         areas: [component.area],
         actionHandler: (component, action, data) => {
           switch (action) {
             case (ComponentAction.SetSize):
-              application.componentManager!.handleSetSizeEvent(component, data);
+              application.componentManager.handleSetSizeEvent(component, data);
               break;
             case (ComponentAction.KeyDown):
               application.io.handleComponentKeyDown(data.keyboardModifier);
diff --git a/package.json b/package.json
index 692317da1..2318bb4e1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "standard-notes-web",
-  "version": "3.9.2",
+  "version": "3.9.3",
   "license": "AGPL-3.0-or-later",
   "repository": {
     "type": "git",
@@ -72,7 +72,7 @@
     "@reach/listbox": "^0.16.2",
     "@standardnotes/features": "1.8.1",
     "@standardnotes/sncrypto-web": "1.5.3",
-    "@standardnotes/snjs": "2.17.6",
+    "@standardnotes/snjs": "2.17.7",
     "mobx": "^6.3.5",
     "mobx-react-lite": "^3.2.1",
     "preact": "^10.5.15",
diff --git a/yarn.lock b/yarn.lock
index 7097c1474..e16846dae 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2199,10 +2199,10 @@
     buffer "^6.0.3"
     libsodium-wrappers "^0.7.9"
 
-"@standardnotes/snjs@2.17.6":
-  version "2.17.6"
-  resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.17.6.tgz#ce432bd820b565f97e7dbdd096a056f504c1615a"
-  integrity sha512-UGRgxzVdMlwGX9xTdve/Cq+H/gDeI8OTyrr2mGeMA79JhhfUwSaEGbriLGkmA9moDctUK+/m79oMtXg/r5Kbtw==
+"@standardnotes/snjs@2.17.7":
+  version "2.17.7"
+  resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.17.7.tgz#10f56e46d6a992e84da94fb7b9ec8dfc8a9a8da3"
+  integrity sha512-7BxEywqhIfYHfkKDlS466vMeWPznXwXrQVj21eKG4ibiAyYhuTXRUYhnCwZKdloNm9Wl0iChJXuiWfev2+tGqg==
   dependencies:
     "@standardnotes/auth" "^3.8.1"
     "@standardnotes/common" "^1.2.1"