diff --git a/.github/workflows/nextjs.yml b/.github/workflows/nextjs.yml
index cdba1fe..c617b80 100644
--- a/.github/workflows/nextjs.yml
+++ b/.github/workflows/nextjs.yml
@@ -53,14 +53,14 @@ jobs:
         with:
           node-version: "16"
           cache: ${{ steps.detect-package-manager.outputs.manager }}
-      #- name: Setup Pages
-      #  uses: actions/configure-pages@v3
-      #  with:
-      # Automatically inject basePath in your Next.js configuration file and disable
-      # server side image optimization (https://nextjs.org/docs/api-reference/next/image#unoptimized).
-      #
-      # You may remove this line if you want to manage the configuration yourself.
-      #static_site_generator: next
+      - name: Setup Pages
+        uses: actions/configure-pages@v3
+        with:
+          # Automatically inject basePath in your Next.js configuration file and disable
+          # server side image optimization (https://nextjs.org/docs/api-reference/next/image#unoptimized).
+
+          # You may remove this line if you want to manage the configuration yourself.
+          static_site_generator: next
       - name: Restore cache
         uses: actions/cache@v3
         with:
@@ -79,8 +79,9 @@ jobs:
           NEXT_PUBLIC_WC_PROJECT_ID: ${{ secrets.NEXT_PUBLIC_WC_PROJECT_ID }}
           NEXT_PUBLIC_INFURA_API_KEY: ${{ secrets.NEXT_PUBLIC_INFURA_API_KEY }}
         run: ${{ steps.detect-package-manager.outputs.runner }} next build
-      #- name: Static HTML export with Next.js
-      #  run: ${{ steps.detect-package-manager.outputs.runner }} next export
+        # # "next export" is no longer needed when "output: export" is configured in next.config.js
+        #- name: Static HTML export with Next.js
+        #  run: ${{ steps.detect-package-manager.outputs.runner }} next export
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v2
         with:
diff --git a/next.config.js b/next.config.js
index aa1351e..a35bfad 100644
--- a/next.config.js
+++ b/next.config.js
@@ -1,7 +1,6 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   output: "export",
-  basePath: "/test-wagmi-safe-privy",
 };
 
 module.exports = nextConfig;
diff --git a/src/app/page.tsx b/src/app/page.tsx
index be2eb91..1891daa 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,23 +1,38 @@
 "use client";
 
+import { useIsContractWallet } from "@/components/hooks/isContractWallet";
 import {
+  storageABI,
   useStorageRetrieve,
   useStorageStore,
-  storageABI,
 } from "@/generated/wagmi";
-import { Button, Flex, FormControl, Input, Text } from "@chakra-ui/react";
+import { resolveSafeTx } from "@/utils/safe";
+import { safeDecodeLogs } from "@/utils/safeDecodeLogs";
+import {
+  Button,
+  Flex,
+  FormControl,
+  Input,
+  Text,
+  useToast,
+} from "@chakra-ui/react";
 import { usePrivyWagmi } from "@privy-io/wagmi-connector";
 import { useCallback, useEffect, useState } from "react";
 import { decodeEventLog } from "viem";
-import { useWaitForTransaction } from "wagmi";
+import { useNetwork, useWaitForTransaction } from "wagmi";
 import { WriteContractResult } from "wagmi/actions";
 
 export default function Home() {
-  const { ready, wallet } = usePrivyWagmi();
+  const { ready, wallet: activeWallet, setActiveWallet } = usePrivyWagmi();
+  const { chain } = useNetwork();
+
+  const toast = useToast();
   const [newVal, setNewVal] = useState<number>();
   const [curVal, setCurVal] = useState<number>();
   const [tx, setTx] = useState<WriteContractResult>();
 
+  const isContractWallet = useIsContractWallet();
+
   const { data, error, status } = useStorageRetrieve();
   const { writeAsync } = useStorageStore();
   const { data: receipt, isError, isLoading } = useWaitForTransaction(tx);
@@ -31,38 +46,45 @@ export default function Home() {
   useEffect(() => {
     if (!receipt) return;
 
-    const numberChangedEvent = receipt.logs
-      .map((log) =>
-        decodeEventLog({
-          abi: storageABI,
-          ...log,
-        })
-      )
-      .find((e) => (e.eventName = "NumberChanged"));
+    const numberChangedEvent = safeDecodeLogs(receipt, storageABI).find(
+      (e) => e?.eventName == "NumberChanged"
+    );
     if (!numberChangedEvent) {
       console.warn("couldnt find numberchanged event");
       return;
     }
 
     console.log(numberChangedEvent);
+    toast({
+      status: "success",
+      title: "Number updated",
+      description: `to ${numberChangedEvent.args._new}`,
+    });
     setCurVal(Number(numberChangedEvent.args._new));
-  }, [receipt]);
+  }, [receipt, toast]);
 
   const onSubmit = useCallback(async () => {
-    if (newVal === undefined) return;
+    if (!activeWallet || !chain || newVal === undefined) return;
 
     try {
       const writeResult = await writeAsync({
         args: [BigInt(newVal || 0n)],
       });
       console.info(writeResult);
-      setTx(writeResult);
+      if (isContractWallet) {
+        //try to resolve the underlying transaction
+        const resolvedTx = await resolveSafeTx(chain.id, writeResult.hash);
+        if (!resolvedTx) throw new Error("couldn resolve safe tx");
+        setTx({ hash: resolvedTx });
+      } else {
+        setTx(writeResult);
+      }
     } catch (e: any) {
       console.error(e);
     }
-  }, [newVal, writeAsync]);
+  }, [activeWallet, chain, newVal, writeAsync, isContractWallet]);
 
-  if (!wallet) return <Text>Pls connect</Text>;
+  if (!activeWallet) return <Text>Pls connect</Text>;
   return (
     <main>
       <Text>
diff --git a/src/components/LoginButton.tsx b/src/components/LoginButton.tsx
index e0c8d8c..45862a5 100644
--- a/src/components/LoginButton.tsx
+++ b/src/components/LoginButton.tsx
@@ -5,23 +5,23 @@ import { usePrivyWagmi } from "@privy-io/wagmi-connector";
 import { useDisconnect } from "wagmi";
 
 export const LoginButton = () => {
-  const { wallet } = usePrivyWagmi();
+  const { wallet: activeWallet } = usePrivyWagmi();
   const { connectWallet, ready, authenticated, logout } = usePrivy();
 
   const { disconnect } = useDisconnect();
 
   //const { wallets } = useWallets();
 
-  if (wallet) {
+  if (activeWallet) {
     return (
       <Flex>
-        <Text>{wallet.address}</Text>
+        <Text>{activeWallet.address}</Text>
         <Button
           onClick={() => {
             disconnect();
             try {
               logout();
-              wallet.disconnect();
+              activeWallet.disconnect();
             } catch (e: any) {
               console.warn("cant disconnect wallet");
             }
diff --git a/src/components/hooks/isContractWallet.tsx b/src/components/hooks/isContractWallet.tsx
new file mode 100644
index 0000000..e87c96a
--- /dev/null
+++ b/src/components/hooks/isContractWallet.tsx
@@ -0,0 +1,26 @@
+import { usePrivyWagmi } from "@privy-io/wagmi-connector";
+import { useEffect, useState } from "react";
+import { Address } from "viem";
+import { usePublicClient } from "wagmi";
+
+export const useIsContractWallet = () => {
+  const publicClient = usePublicClient();
+  const [isContractWallet, setIsContractWallet] = useState<boolean>();
+  const { wallet: activeWallet } = usePrivyWagmi();
+
+  useEffect(() => {
+    if (!activeWallet || !publicClient) return;
+
+    console.log(activeWallet, publicClient);
+
+    //maybe check -> if (activeWallet.connectorType.startsWith("wallet_connect"))
+
+    publicClient
+      .getBytecode({ address: activeWallet.address as Address })
+      .then((b) => {
+        setIsContractWallet((b?.length || 0) > 0);
+      });
+  }, [activeWallet, publicClient]);
+
+  return isContractWallet;
+};
diff --git a/src/utils/delay.ts b/src/utils/delay.ts
new file mode 100644
index 0000000..633c348
--- /dev/null
+++ b/src/utils/delay.ts
@@ -0,0 +1,5 @@
+export function delay(milliseconds: number) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, milliseconds);
+  });
+}
diff --git a/src/utils/safe.ts b/src/utils/safe.ts
new file mode 100644
index 0000000..a6a4118
--- /dev/null
+++ b/src/utils/safe.ts
@@ -0,0 +1,59 @@
+// emulates some features of api kit https://github.com/safe-global/safe-core-sdk/tree/main/packages/api-kit
+// https://docs.safe.global/safe-core-api/available-services
+
+import { Address } from "viem";
+import { goerli, mainnet } from "viem/chains";
+import { delay } from "./delay";
+
+type TxServiceApiTransactionResponse = {
+  safe: Address;
+  to: Address;
+  data: `0x${string}`;
+  blockNumber: number;
+  transactionHash: `0x${string}`;
+  safeTxHash: `0x${string}`;
+  executor: Address;
+  isExecuted: boolean;
+  isSuccessful: boolean;
+  confirmations: Array<{
+    owner: Address;
+  }>;
+};
+
+const NetworkMap: Record<number, string | null> = {
+  [goerli.id]: "goerli",
+  [mainnet.id]: "mainnet",
+};
+
+// https://safe-transaction-goerli.safe.global/
+// https://safe-transaction-mainnet.safe.global/
+/**
+ * @param network goerli|mainnet
+ * @param safeTxHash the "internal" safe tx hash
+ * @returns 0xstring the executed transaction
+ */
+export const resolveSafeTx = async (
+  networkId: number,
+  safeTxHash: `0x${string}`,
+  attempt = 1
+): Promise<`0x${string}` | undefined> => {
+  const server = `https://safe-transaction-${NetworkMap[networkId]}.safe.global`;
+  //  https://safe-transaction-goerli.safe.global/api/v1/multisig-transactions/0xc02ba93a6f025e3e78dfceb5c9d4d681aa9aafc780ba6243d3d70ac9fdf48288/'
+  const url = `${server}/api/v1/multisig-transactions/${safeTxHash}`;
+
+  const response = <TxServiceApiTransactionResponse>(
+    await (await fetch(url)).json()
+  );
+  console.debug(`Safe Tx Api attempt ${attempt}`, response);
+  if (response.isSuccessful === null) {
+    await delay(2500 * attempt);
+    return resolveSafeTx(networkId, safeTxHash, attempt + 1);
+  }
+
+  if (!response.isSuccessful) {
+    return undefined;
+  }
+  return response.transactionHash;
+};
+
+// export const isSafe = (address: Address) => {};
diff --git a/src/utils/safeDecodeLogs.ts b/src/utils/safeDecodeLogs.ts
new file mode 100644
index 0000000..ebf47b4
--- /dev/null
+++ b/src/utils/safeDecodeLogs.ts
@@ -0,0 +1,17 @@
+import { Abi, TransactionReceipt, decodeEventLog } from "viem";
+
+export const safeDecodeLogs = (receipt: TransactionReceipt, abi: Abi) => {
+  return receipt.logs
+    .map((log) => {
+      try {
+        return decodeEventLog({
+          abi,
+          data: log.data,
+          topics: log.topics,
+        }) as any;
+      } catch (e) {
+        return null;
+      }
+    })
+    .filter((log) => !!log);
+};