@osovitny/anatoly 2.14.45 → 2.14.47

package/fesm2020/osovitny-anatoly.mjs

@@ -1398,8 +1398,8 @@ class AppContextService extends BaseApiService {
         if (lr) {
             let now = new Date();
             let lastRequested = new Date(context.lastRequested);
-            let in2Mins = new Date(lastRequested.getFullYear(), lastRequested.getMonth(), lastRequested.getDate(), lastRequested.getHours(), lastRequested.getMinutes() + 2, 0, 0);
-            if (in2Mins.getTime() < now.getTime()) {
+            let in3Mins = new Date(lastRequested.getFullYear(), lastRequested.getMonth(), lastRequested.getDate(), lastRequested.getHours(), lastRequested.getMinutes() + 3, 0, 0);
+            if (in3Mins.getTime() < now.getTime()) {
                 shouldBeUpdated = true;
             }
         }
@@ -1450,15 +1450,12 @@ class AppContextService extends BaseApiService {
         });
     }
     updateCurrent(success = null) {
-        this.getCurrent(success, false);
+        this.clearCurrent();
+        this.getLatestCurrent(success);
     }
     clearCurrent() {
         this.sessionStorage.remove(this.storageKeyName);
     }
-    refreshCurrent() {
-        this.clearCurrent();
-        this.updateCurrent();
-    }
     //Properties
     get current() {
         this.updateCurrentIfExpired();
@@ -3506,7 +3503,9 @@ class ContactUsForm extends BaseEditComponent {
     }
     ngOnInit() {
         this.createFormGroup();
-        this.init();
+        this.appContext.getCurrent(context => {
+            this.setContext(context);
+        });
     }
     createFormGroup() {
         this.formGroup = this.fb.group({
@@ -3518,17 +3517,15 @@ class ContactUsForm extends BaseEditComponent {
             message: new FormControl('', [Validators.required])
         });
     }
-    init() {
-        this.appContext.getCurrent(context => {
-            this.isUserSignedIn = context.isUserSignedIn;
-            this.siteKey = context.reCaptchaSiteKey;
-            this.selectedTopic = this.topicList[3].value;
-            this.setFormValue('topic', this.selectedTopic);
-            if (this.isUserSignedIn) {
-                this.setFormValue('name', context.user.displayNameOrFullName);
-                this.setFormValue('email', context.user.email);
-            }
-        }, false);
+    setContext(context) {
+        this.isUserSignedIn = context.isUserSignedIn;
+        this.siteKey = context.reCaptchaSiteKey;
+        this.selectedTopic = this.topicList[3].value;
+        this.setFormValue('topic', this.selectedTopic);
+        if (this.isUserSignedIn) {
+            this.setFormValue('name', context.user.displayNameOrFullName);
+            this.setFormValue('email', context.user.email);
+        }
     }
     isValid() {
         return this.formGroup.valid;