Merge pull request #374 from CirclesUBI/feature/app-390-fix-runtime-e…

…rrors Feature/app 390 fix runtime errors
CirclesUBI · Jul 27, 2023 · f89f7ab · f89f7ab
2 parents e6f53b8 + dd47915
commit f89f7ab
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 34 deletions.
diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz
diff --git a/shell/src/App.svelte b/shell/src/App.svelte
@@ -4,7 +4,7 @@
   const followTrust: FollowTrust = new FollowTrust();
   followTrust.start();
 
-  export const FollowTrustWorker = followTrust;followTrust
+  export const FollowTrustWorker = followTrust;
 </script>
 <script lang="ts">
 import "./shared/css/tailwind.css";

diff --git a/shell/src/main.ts b/shell/src/main.ts
@@ -1,29 +1,29 @@
-import {RpcGateway} from "@o-platform/o-circles/dist/rpcGateway";
+import { RpcGateway } from "@o-platform/o-circles/dist/rpcGateway";
 import dayjs from "dayjs";
 import relativeTime from "dayjs/plugin/relativeTime";
-import {_, setupI18n} from "./i18n/i18nDictionary";
-import {get} from "svelte/store";
-import {ProcessDefinition} from "@o-platform/o-process/dist/interfaces/processManifest";
-import {ProcessContext} from "@o-platform/o-process/dist/interfaces/processContext";
-import {Generate} from "@o-platform/o-utils/dist/generate";
+import { _, setupI18n } from "./i18n/i18nDictionary";
+import { get } from "svelte/store";
+import { ProcessDefinition } from "@o-platform/o-process/dist/interfaces/processManifest";
+import { ProcessContext } from "@o-platform/o-process/dist/interfaces/processContext";
+import { Generate } from "@o-platform/o-utils/dist/generate";
 import * as LoadingIndicator from "./shared/atoms/LoadingIndicator.svelte";
 import Success from "./shared/atoms/Success.svelte";
 import ErrorIndicator from "./shared/atoms/Error.svelte";
-import {useMachine} from "@xstate/svelte";
-import {Subject, Subscription} from "rxjs";
-import {ProcessEvent} from "@o-platform/o-process/dist/interfaces/processEvent";
-import {AnyEventObject} from "xstate";
-import {Bubble} from "@o-platform/o-process/dist/events/bubble";
-import {PlatformEvent} from "@o-platform/o-events/dist/platformEvent";
-import {Process} from "@o-platform/o-process/dist/interfaces/process";
-import {Sinker} from "@o-platform/o-process/dist/events/sinker";
-import {shellEvents} from "./shared/shellEvents";
-import {ApiConnection} from "./shared/apiConnection";
-import {Stopped} from "@o-platform/o-process/dist/events/stopped";
-import {Environment} from "./shared/environment";
-import {IShell} from "./iShell";
+import { useMachine } from "@xstate/svelte";
+import { Subject, Subscription } from "rxjs";
+import { ProcessEvent } from "@o-platform/o-process/dist/interfaces/processEvent";
+import { AnyEventObject } from "xstate";
+import { Bubble } from "@o-platform/o-process/dist/events/bubble";
+import { PlatformEvent } from "@o-platform/o-events/dist/platformEvent";
+import { Process } from "@o-platform/o-process/dist/interfaces/process";
+import { Sinker } from "@o-platform/o-process/dist/events/sinker";
+import { shellEvents } from "./shared/shellEvents";
+import { ApiConnection } from "./shared/apiConnection";
+import { Stopped } from "@o-platform/o-process/dist/events/stopped";
+import { Environment } from "./shared/environment";
+import { IShell } from "./iShell";
 import * as Sentry from "@sentry/browser";
-import {BrowserTracing} from "@sentry/tracing";
+import { BrowserTracing } from "@sentry/tracing";
 import * as bip39 from "bip39";
 import posthog from 'posthog-js'
 
@@ -124,7 +124,7 @@ window.o = <any>{
     },
     async run<TContext>(definition: ProcessDefinition<any, any>, contextModifier?: (processContext: ProcessContext<any>) => Promise<TContext>) {
       const processId = Generate.randomHexString(8);
-      console.log(`Starting process (id: ${processId}) with definition:`, definition);
+      // console.log(`Starting process (id: ${processId}) with definition:`, definition);
 
       const machine = (<any>definition).stateMachine(LoadingIndicator, Success, ErrorIndicator);
       const machineOptions = {

diff --git a/shell/src/shared/followTrust.ts b/shell/src/shared/followTrust.ts
@@ -3,6 +3,7 @@ import { me } from "./stores/me";
 import { ApiClient } from "./apiConnection";
 import { fSetTrust } from "../dapps/o-banking/processes/setTrust";
 import { Environment } from "./environment";
+import { get } from 'svelte/store'
 
 export class FollowTrust {
   static readonly shortIntervalInMilliseconds = 6000;
@@ -12,7 +13,7 @@ export class FollowTrust {
   private intervalHandle: any;
   private isWorking = false;
 
-  constructor() {}
+  constructor() { }
 
   reset() {
     this.stop();
@@ -25,7 +26,9 @@ export class FollowTrust {
 
     this.intervalHandle = setInterval(() => {
       // console.log(`FollowTrust is running. (isWorking: ${this.isWorking})`);
-      if (this.isWorking) {
+      const $me = get(me)
+
+      if (this.isWorking || !$me?.id) {
         return;
       }
       this.followTrust()

diff --git a/shell/src/shared/openLogin.ts b/shell/src/shared/openLogin.ts
@@ -15,6 +15,7 @@ export async function getOpenLogin(): Promise<GetOpenLoginResult> {
           privKey: acc.privateKey,
         };
       },
+      // async logout(): Promise<void> { },
       async getUserInfo(): Promise<OpenloginUserInfo> {
         return {
           email: "[email protected]",

diff --git a/shell/src/shared/processes/shellProcess.ts b/shell/src/shared/processes/shellProcess.ts
@@ -54,6 +54,7 @@ const processDefinition = () => {
           id: childProcessId,
           src: (context) => {
             const sm = context.childProcessDefinition.stateMachine(childProcessId);
+            // console.log(`Running child process ${processId}: `, sm);
             // console.log(`invoking child process: ${sm.id}`)
             return <any>sm; // TODO: Fix 'any'
           },
@@ -125,7 +126,7 @@ const processDefinition = () => {
             field: {
               name: "",
               get: () => undefined,
-              set: (o: any) => {},
+              set: (o: any) => { },
             },
           }),
         ],

diff --git a/shell/src/shared/stores/pagedEventQuery.ts b/shell/src/shared/stores/pagedEventQuery.ts
@@ -113,15 +113,10 @@ export abstract class PagedEventQuery implements ObjectCache<ProfileEvent> {
 
   async next(): Promise<boolean> {
     let $me: Profile;
-    me.subscribe((m) => ($me = m))();
-
-    // Possible Solution for avoiding thrown an Error here when the user is not logged in
-    // const sessionInfo = await me.getSessionInfo(true);
-    // if (!sessionInfo.isLoggedOn) {
-    //   console.log("NO SESSION, BAILING");
-    //   return false;
-    // }
-
+    me.subscribe(m => $me = m)();
+    if (!$me?.id) {
+      return;
+    }
     const args = <QueryEventsArgs>{
       safeAddress: $me.circlesAddress,
       types: this.eventTypes,