diff --git a/src/lib/components/GoogleAuth.svelte b/src/lib/components/GoogleAuth.svelte
index b9b0434..63d422b 100644
--- a/src/lib/components/GoogleAuth.svelte
+++ b/src/lib/components/GoogleAuth.svelte
@@ -2,13 +2,13 @@
import { onMount } from 'svelte';
import { isSignInRedirect, getProviderFromUrl } from '@lit-protocol/lit-auth-client';
import type { IRelayPKP } from '@lit-protocol/types';
- import { ProviderType } from '@lit-protocol/constants';
+ // import { ProviderType } from '@lit-protocol/constants';
import Icon from '@iconify/svelte';
import { createLitSession } from '$lib/services/createLitSession/createLitSession';
import Apps from '$lib/components/Apps.svelte';
+ import { connectProvider } from '$lib/services/provider/setupLit';
const redirectUri = 'http://localhost:5173/';
- export let services;
let sessionSigs, error, currentPKP, authMethod, provider;
let log = '';
@@ -22,7 +22,7 @@
async function initialize() {
addToLog('Initialization...');
try {
- provider = await services.setupLit.connectProvider();
+ provider = await connectProvider();
addToLog('Connected to Google provider.');
if (isSignInRedirect(redirectUri)) {
const providerName = getProviderFromUrl();
@@ -38,7 +38,7 @@
async function authWithGoogle() {
try {
if (!provider) {
- provider = await services.setupLit.connectProvider();
+ provider = await connectProvider();
addToLog('Reconnected to Google provider.');
}
await provider.signIn();
diff --git a/src/lib/components/Messages.svelte b/src/lib/components/Messages.svelte
index 3cfb6a5..7717ba2 100644
--- a/src/lib/components/Messages.svelte
+++ b/src/lib/components/Messages.svelte
@@ -1,6 +1,6 @@
-
-
- PkpWallet
- {#if $store.pkpWallet}
-
- PKP Wallet: {$store.pkpWallet.address}
-
-
- {/if}
-
-
diff --git a/src/lib/components/refactor/ComposerWallet.svelte b/src/lib/components/refactor/ComposerWallet.svelte
new file mode 100644
index 0000000..d1d195d
--- /dev/null
+++ b/src/lib/components/refactor/ComposerWallet.svelte
@@ -0,0 +1,23 @@
+
+
+
+
+ PKP Wallet:
+ {#if $me.context.pkpWallet}
+ {$me.context.pkpWallet.address}
+ {/if}
+
+
+
+
diff --git a/src/lib/core/refactor/Composer.svelte b/src/lib/core/Composer.svelte
similarity index 97%
rename from src/lib/core/refactor/Composer.svelte
rename to src/lib/core/Composer.svelte
index f9e2c3c..a6deaf7 100644
--- a/src/lib/core/refactor/Composer.svelte
+++ b/src/lib/core/Composer.svelte
@@ -77,7 +77,8 @@
core: coreServices,
state: component.machineService || null
},
- data: component.data || {} // Add this line
+ data: component.data || {},
+ context: component.machine?.context || {} // Add context here
}));
if (component.children) {
diff --git a/src/lib/core/refactor/componentLoader.ts b/src/lib/core/componentLoader.ts
similarity index 100%
rename from src/lib/core/refactor/componentLoader.ts
rename to src/lib/core/componentLoader.ts
diff --git a/src/lib/core/refactor/composerStores.ts b/src/lib/core/composerStores.ts
similarity index 100%
rename from src/lib/core/refactor/composerStores.ts
rename to src/lib/core/composerStores.ts
diff --git a/src/lib/core/refactor/coreServices.ts b/src/lib/core/coreServices.ts
similarity index 100%
rename from src/lib/core/refactor/coreServices.ts
rename to src/lib/core/coreServices.ts
diff --git a/src/lib/core/refactor/queryLoader.ts b/src/lib/core/queryLoader.ts
similarity index 100%
rename from src/lib/core/refactor/queryLoader.ts
rename to src/lib/core/queryLoader.ts
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 676fe71..b72d391 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -7,7 +7,7 @@
import { onMount } from 'svelte';
import { Drawer, drawerStore } from '@skeletonlabs/skeleton';
- import Composer from '$lib/core/refactor/Composer.svelte';
+ import Composer from '$lib/core/Composer.svelte';
const providerData = {
walletConnectId: import.meta.env.VITE_WALLETCONNECT_ID
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index de67d85..3975613 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,5 +1,5 @@