diff --git a/apps/taquito-test-dapp/src/App.svelte b/apps/taquito-test-dapp/src/App.svelte
index cc7f65b418..0d8ff2808d 100644
--- a/apps/taquito-test-dapp/src/App.svelte
+++ b/apps/taquito-test-dapp/src/App.svelte
@@ -3,7 +3,7 @@
   import { TezosToolkit } from "@taquito/taquito";
   import { NetworkType } from "@airgap/beacon-sdk";
   import Select from "svelte-select";
-  import { rpcUrl } from "./config";
+  import { getRpcUrl } from "./config";
   import store from "./store";
   import Layout from "./Layout.svelte";
   import TestContainer from "./lib/TestContainer.svelte";
@@ -35,12 +35,11 @@
   let networkError = false;
   let showCustomNetworkInput = false;
   let customNetworkInput = "https://";
-  const groupBy = (item) => item.group;
+  const groupBy = (item: { group: any }) => item.group;
 
-  const changeNetwork = (event) => {
+  const changeNetwork = (event: { detail: { value: string } }) => {
     networkError = false;
     showCustomNetworkInput = false;
-    const walletComponent = layout.getSideBar().getWallet();
     switch (event.detail.value.toLocaleLowerCase()) {
       case "mainnet":
         store.updateNetworkType(NetworkType.MAINNET);
@@ -48,9 +47,6 @@
       case "ghostnet":
         store.updateNetworkType(NetworkType.GHOSTNET);
         break;
-      case "mumbainet":
-        store.updateNetworkType(NetworkType.MUMBAINET);
-        break;
       case "nairobinet":
         store.updateNetworkType(NetworkType.NAIROBINET);
         break;
@@ -58,7 +54,7 @@
         //TODO: input custom RPC URL
         showCustomNetworkInput = true;
         setTimeout(() => {
-          document.getElementById("custom-network-input").focus();
+          document.getElementById("custom-network-input")?.focus();
         }, 100);
         break;
       default:
@@ -67,7 +63,7 @@
     }
   };
 
-  const changeMatrixNode = (event) => {
+  const changeMatrixNode = (event: { detail: { value: string } }) => {
     switch (event.detail.value.toLocaleLowerCase()) {
       case "default":
         store.updateMatrixNode("beacon-node-1.sky.papers.tech");
@@ -77,9 +73,10 @@
         break;
       case "custom":
         store.updateMatrixNode("beacon-node-1.sky.papers.tech");
-        if (!rpcUrl.custom) {
+        if (!getRpcUrl(NetworkType.CUSTOM)) {
+          // TODO: This logic does not seem right
           // in case the user did not provide any custom network URL
-          store.updateTezos(new TezosToolkit(rpcUrl.ghostnet));
+          store.updateTezos(new TezosToolkit(getRpcUrl(NetworkType.GHOSTNET)));
         }
         break;
     }
@@ -116,7 +113,7 @@
 <style lang="scss">
   .connect-container {
     width: 100%;
-    height: 100%;
+    height: 60%;
     display: grid;
     place-items: center;
 
@@ -194,7 +191,7 @@
           <button
             on:click={() => {
               const wallet = document.getElementById("wallet-button");
-              wallet.click();
+              wallet?.click();
             }}
           >
             <span class="material-icons-outlined"> account_balance_wallet </span>
diff --git a/apps/taquito-test-dapp/src/Layout.svelte b/apps/taquito-test-dapp/src/Layout.svelte
index 53efca2d9e..2a469d51fd 100644
--- a/apps/taquito-test-dapp/src/Layout.svelte
+++ b/apps/taquito-test-dapp/src/Layout.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
   import Sidebar from "./lib/Sidebar.svelte";
-  import TaquitoLogo from "./lib/TaquitoLogo.svelte";
   import store from "./store";
   let side: Sidebar;
 
@@ -25,6 +24,25 @@
       background: rgba(4, 189, 228, 0.8);
     }
   }
+  .events-container {
+    border: 1px solid navy;
+    margin: 3px;
+    padding: 3px;
+    grid-column: 1 / 3;
+    display: flex;
+    flex-direction: column;
+
+    > span {
+      color: white;
+      font-weight: bold;
+      font-size: larger;
+    }
+    ul {
+      overflow-y: scroll;
+      flex-grow: 1; 
+      background-color: skyblue;
+    }
+  }
 </style>
 
 <main>
@@ -35,6 +53,15 @@
   </div>
   <Sidebar bind:this={side}/>
   <slot />
+  <div class="events-container">
+    <span>Events ({$store.eventLogs.length}): <button on:click={store.clearEvents} style="display: inline;">clear</button></span>
+    <ul>
+      {#each $store.eventLogs as event}
+        <li>
+          <span class="material-icons-outlined"> event_note </span>
+          <span>{event}</span>
+        </li>
+      {/each}
+    </ul>
+  </div>  
 </main>
-<TaquitoLogo dir="normal" />
-<TaquitoLogo dir="reverse" />
diff --git a/apps/taquito-test-dapp/src/config.ts b/apps/taquito-test-dapp/src/config.ts
index 9d12294df6..c56aa13253 100644
--- a/apps/taquito-test-dapp/src/config.ts
+++ b/apps/taquito-test-dapp/src/config.ts
@@ -1,14 +1,31 @@
 import { NetworkType } from "@airgap/beacon-sdk";
 
-export const rpcUrl = {
-  mumbainet: "https://mumbainet.ecadinfra.com/",
-  nairobinet: "https://nairobinet.ecadinfra.com/",
-  ghostnet: "https://ghostnet.ecadinfra.com/",
-  ithacanet: "https://ithacanet.ecadinfra.com/",
-  mainnet: "https://mainnet.ecadinfra.com", //"https://mainnet-tezos.giganode.io"
-  custom: "https://ghostnet.ecadinfra.com/"
+export type SupportedNetworks = NetworkType.NAIROBINET | NetworkType.GHOSTNET | NetworkType.MAINNET | NetworkType.CUSTOM;
+
+const rpcUrls: Record<SupportedNetworks, string> = {
+  [NetworkType.NAIROBINET]: "https://nairobinet.ecadinfra.com/",
+  [NetworkType.GHOSTNET]: "https://ghostnet.ecadinfra.com/",
+  [NetworkType.MAINNET]: "https://mainnet.ecadinfra.com", //"https://mainnet-tezos.giganode.io"
+  [NetworkType.CUSTOM]: "https://ghostnet.ecadinfra.com/",
 };
 
+export const getRpcUrl = (networkType: SupportedNetworks): string => {
+  return rpcUrls[networkType];
+}
+
+export const getTzKtUrl = (networkType: SupportedNetworks): string | undefined => {
+  switch (networkType) {
+    case NetworkType.NAIROBINET:
+      return "https://nairobinet.tzkt.io";
+    case NetworkType.GHOSTNET:
+      return "https://ghostnet.tzkt.io";
+    case NetworkType.MAINNET:
+      return "https://tzkt.io";
+    case NetworkType.CUSTOM:
+      return undefined;
+  }
+}
+
 export const defaultMatrixNode = "beacon-node-1.sky.papers.tech";
 
 export const defaultNetworkType = NetworkType.GHOSTNET;
diff --git a/apps/taquito-test-dapp/src/lib/Sidebar.svelte b/apps/taquito-test-dapp/src/lib/Sidebar.svelte
index 7b561e6a6b..705d564b13 100644
--- a/apps/taquito-test-dapp/src/lib/Sidebar.svelte
+++ b/apps/taquito-test-dapp/src/lib/Sidebar.svelte
@@ -21,7 +21,7 @@
 <style lang="scss">
   section {
     padding: 10px;
-    height: calc(100vh - 20px);
+    height: 100%;
     color: white;
     display: grid;
     grid-template-rows: 8% 5% 87%;
@@ -43,17 +43,14 @@
 
     ul {
       height: 95%;
-      list-style-image: url(description_white_24dp.svg);
+      list-style-image: url(../assets/icons/description_white_24dp.svg);
       list-style-position: inside;
-      overflow: auto;
+      overflow-y: scroll;
+      overflow-x: auto;
       margin-left: 0px;
       margin-bottom: 50px;
       padding: 5px 5px;
 
-      &::-webkit-scrollbar {
-        display: none;
-      }
-
       li {
         background: rgba(80, 227, 194, 0.25);
         backdrop-filter: blur(4px);
@@ -103,6 +100,7 @@
       {/each}
     {:else}
       {#each $store.tests as test}
+        <!-- svelte-ignore a11y-click-events-have-key-events a11y-no-noninteractive-element-interactions -->
         <li
           id={test.id}
           style={$store.userAddress ? "cursor:pointer" : "cursor:not-allowed"}
diff --git a/apps/taquito-test-dapp/src/lib/TestContainer.svelte b/apps/taquito-test-dapp/src/lib/TestContainer.svelte
index a478def673..fc4fd57eb5 100644
--- a/apps/taquito-test-dapp/src/lib/TestContainer.svelte
+++ b/apps/taquito-test-dapp/src/lib/TestContainer.svelte
@@ -4,7 +4,7 @@
   import type { TestSettings, TestResult } from "../types";
   import { shortenHash } from "../utils";
   import { NetworkType } from "@airgap/beacon-sdk";
-  import { stringify } from "@taquito/core";
+  import { getTzKtUrl } from "../config";
 
   let test: TestSettings | undefined;
   let executionTime = 0;
@@ -335,36 +335,12 @@
           {#if opHash}
             <div style="word-break:break-word;">
               Operation hash:
-              {#if $store.networkType === NetworkType.ITHACANET}
-                <a
-                  href={`https://better-call.dev/ithacanet/opg/${opHash}/contents`}
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  {shortenHash(opHash)}
-                </a>
-              {:else if $store.networkType === NetworkType.HANGZHOUNET}
-                <a
-                  href={`https://better-call.dev/hangzhounet/opg/${opHash}/contents`}
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  {shortenHash(opHash)}
-                </a>
-              {:else if $store.networkType === NetworkType.GHOSTNET}
-                <a
-                  href={`https://better-call.dev/ghostnet/opg/${opHash}/contents`}
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  {shortenHash(opHash)}
-                </a>
-              {:else if $store.networkType === NetworkType.MAINNET}
-                <a href={`https://tzkt.io/${opHash}`} target="_blank" rel="noopener noreferrer">
+              {#if $store.networkType === NetworkType.CUSTOM}
+                {shortenHash(opHash)}
+              {:else}
+                <a href={`${getTzKtUrl($store.networkType)}/${opHash}`} target="_blank" rel="noopener noreferrer">
                   {shortenHash(opHash)}
                 </a>
-              {:else}
-                {shortenHash(opHash)}
               {/if}
             </div>
           {/if}
diff --git a/apps/taquito-test-dapp/src/lib/Wallet.svelte b/apps/taquito-test-dapp/src/lib/Wallet.svelte
index 748d0b8a02..148902d4f6 100644
--- a/apps/taquito-test-dapp/src/lib/Wallet.svelte
+++ b/apps/taquito-test-dapp/src/lib/Wallet.svelte
@@ -4,17 +4,17 @@
   import { TezosToolkit } from "@taquito/taquito";
   import { BeaconWallet } from "@taquito/beacon-wallet";
   // import { BeaconEvent, defaultEventCallbacks } from "@airgap/beacon-sdk";
-  import type { DAppClientOptions, NetworkType } from "@airgap/beacon-sdk";
+  import { BeaconEvent, type DAppClientOptions } from "@airgap/beacon-sdk";
   import store from "../store";
   import { formatTokenAmount, shortenHash } from "../utils";
-  import { defaultMatrixNode, rpcUrl, defaultNetworkType } from "../config";
+  import { defaultMatrixNode, getRpcUrl, defaultNetworkType, type SupportedNetworks } from "../config";
   import type { TezosAccountAddress } from "../types";
 
   let showDialog = false;
   let connectedWallet = "";
 
   const createNewWallet = (config: {
-    networkType: NetworkType,
+    networkType: SupportedNetworks,
   }) => {
     const options: DAppClientOptions = {
       name: "Taquito Test Dapp",
@@ -47,13 +47,15 @@
           networkType: $store.networkType
         });
 
+    subscribeToAllEvents(wallet);
+
     try {
       await wallet.requestPermissions();
 
       const userAddress = (await wallet.getPKH()) as TezosAccountAddress;
       store.updateUserAddress(userAddress);
-
-      const Tezos = new TezosToolkit(rpcUrl[$store.networkType]);
+      const url = getRpcUrl($store.networkType);
+      const Tezos = new TezosToolkit(url);
       Tezos.setWalletProvider(wallet);
       store.updateTezos(Tezos);
 
@@ -72,7 +74,7 @@
   };
 
   const disconnectWallet = async () => {
-    await $store.wallet.clearActiveAccount();
+    await $store.wallet?.clearActiveAccount();
     store.updateUserAddress(undefined);
     store.updateUserBalance(undefined);
     store.updateWallet(undefined);
@@ -80,7 +82,7 @@
   };
 
   export const setWallet = async (config: {
-    networkType: NetworkType,
+    networkType: SupportedNetworks,
   }) => {
     if (window && window.localStorage) {
       // finds the Beacon keys
@@ -95,7 +97,8 @@
 
     const wallet = createNewWallet(config);
     store.updateWallet(wallet);
-    const Tezos = new TezosToolkit(rpcUrl[config.networkType]);
+    const url = getRpcUrl(config.networkType);
+    const Tezos = new TezosToolkit(url);
     Tezos.setWalletProvider(wallet);
     store.updateTezos(Tezos);
 
@@ -127,6 +130,44 @@
       }
     }
   });
+
+const saveLog = (data: unknown, eventType: BeaconEvent) => {
+  const log = JSON.stringify({eventType, data});
+  store.addEvent(log);
+};
+
+function subscribeToAllEvents(wallet: BeaconWallet) {
+  wallet.client.subscribeToEvent(BeaconEvent.PERMISSION_REQUEST_SENT, (data) => saveLog(data, BeaconEvent.PERMISSION_REQUEST_SENT));
+  wallet.client.subscribeToEvent(BeaconEvent.PERMISSION_REQUEST_SUCCESS, (data) => saveLog(data, BeaconEvent.PERMISSION_REQUEST_SUCCESS));
+  wallet.client.subscribeToEvent(BeaconEvent.PERMISSION_REQUEST_ERROR, (data) => saveLog(data, BeaconEvent.PERMISSION_REQUEST_ERROR));
+  wallet.client.subscribeToEvent(BeaconEvent.OPERATION_REQUEST_SENT, (data) => saveLog(data, BeaconEvent.OPERATION_REQUEST_SENT));
+  wallet.client.subscribeToEvent(BeaconEvent.OPERATION_REQUEST_SUCCESS, (data) => saveLog(data, BeaconEvent.OPERATION_REQUEST_SUCCESS));
+  wallet.client.subscribeToEvent(BeaconEvent.OPERATION_REQUEST_ERROR, (data) => saveLog(data, BeaconEvent.OPERATION_REQUEST_ERROR));
+  wallet.client.subscribeToEvent(BeaconEvent.SIGN_REQUEST_SENT, (data) => saveLog(data, BeaconEvent.SIGN_REQUEST_SENT));
+  wallet.client.subscribeToEvent(BeaconEvent.SIGN_REQUEST_SUCCESS, (data) => saveLog(data, BeaconEvent.SIGN_REQUEST_SUCCESS));
+  wallet.client.subscribeToEvent(BeaconEvent.SIGN_REQUEST_ERROR, (data) => saveLog(data, BeaconEvent.SIGN_REQUEST_ERROR));
+  wallet.client.subscribeToEvent(BeaconEvent.BROADCAST_REQUEST_SENT, (data) => saveLog(data, BeaconEvent.BROADCAST_REQUEST_SENT));
+  wallet.client.subscribeToEvent(BeaconEvent.BROADCAST_REQUEST_SUCCESS, (data) => saveLog(data, BeaconEvent.BROADCAST_REQUEST_SUCCESS));
+  wallet.client.subscribeToEvent(BeaconEvent.BROADCAST_REQUEST_ERROR, (data) => saveLog(data, BeaconEvent.BROADCAST_REQUEST_ERROR));
+  wallet.client.subscribeToEvent(BeaconEvent.ACKNOWLEDGE_RECEIVED, (data) => saveLog(data, BeaconEvent.ACKNOWLEDGE_RECEIVED));
+  wallet.client.subscribeToEvent(BeaconEvent.LOCAL_RATE_LIMIT_REACHED, (data) => saveLog(data, BeaconEvent.LOCAL_RATE_LIMIT_REACHED));
+  wallet.client.subscribeToEvent(BeaconEvent.NO_PERMISSIONS, (data) => saveLog(data, BeaconEvent.NO_PERMISSIONS));
+
+  wallet.client.subscribeToEvent(BeaconEvent.ACTIVE_ACCOUNT_SET, (data) => {
+    saveLog(data, BeaconEvent.ACTIVE_ACCOUNT_SET)
+    store.updateUserAddress(data.address);
+    store.updateNetworkType(data.network.type as SupportedNetworks);
+  });
+
+  wallet.client.subscribeToEvent(BeaconEvent.ACTIVE_TRANSPORT_SET, (data) => saveLog(data, BeaconEvent.ACTIVE_TRANSPORT_SET));
+  wallet.client.subscribeToEvent(BeaconEvent.SHOW_PREPARE, (data) => saveLog(data, BeaconEvent.SHOW_PREPARE));
+  wallet.client.subscribeToEvent(BeaconEvent.HIDE_UI, (data) => saveLog(data, BeaconEvent.HIDE_UI));
+  wallet.client.subscribeToEvent(BeaconEvent.PAIR_INIT, (data) => saveLog(data, BeaconEvent.PAIR_INIT));
+  wallet.client.subscribeToEvent(BeaconEvent.PAIR_SUCCESS, (data) => saveLog(data, BeaconEvent.PAIR_SUCCESS));
+  wallet.client.subscribeToEvent(BeaconEvent.CHANNEL_CLOSED, (data) => saveLog(data, BeaconEvent.CHANNEL_CLOSED));
+  wallet.client.subscribeToEvent(BeaconEvent.INTERNAL_ERROR, (data) => saveLog(data, BeaconEvent.INTERNAL_ERROR));
+  wallet.client.subscribeToEvent(BeaconEvent.UNKNOWN, (data) => saveLog(data, BeaconEvent.UNKNOWN));
+}
 </script>
 
 <style lang="scss">
diff --git a/apps/taquito-test-dapp/src/store.ts b/apps/taquito-test-dapp/src/store.ts
index 8d8a4be206..3796f726b9 100644
--- a/apps/taquito-test-dapp/src/store.ts
+++ b/apps/taquito-test-dapp/src/store.ts
@@ -1,22 +1,22 @@
 import { writable } from "svelte/store";
-import type { NetworkType } from "@airgap/beacon-sdk";
 import type { TezosToolkit } from "@taquito/taquito";
 import type { BeaconWallet } from "@taquito/beacon-wallet";
-import { defaultMatrixNode, defaultNetworkType } from "./config";
+import { defaultMatrixNode, defaultNetworkType, type SupportedNetworks } from "./config";
 import type { TestSettings } from "./types";
 
 interface State {
-  Tezos: TezosToolkit;
-  userAddress: string;
-  userBalance: number;
-  wallet: BeaconWallet;
+  Tezos: TezosToolkit | undefined;
+  userAddress: string | undefined;
+  userBalance: number | undefined;
+  wallet: BeaconWallet | undefined;
   disableDefaultEvents: boolean;
-  networkType: NetworkType;
-  customNetworkUrl: string;
+  networkType: SupportedNetworks;
+  customNetworkUrl: string | undefined;
   matrixNode: string;
-  confirmationObservableTest: { level: number; currentConfirmation: number }[];
-  selectedTest: string;
+  confirmationObservableTest: { level: number; currentConfirmation: number }[] | undefined;
+  selectedTest: string | undefined;
   tests: Array<TestSettings>;
+  eventLogs: Array<string>;
 }
 
 const initialState: State = {
@@ -30,19 +30,20 @@ const initialState: State = {
   customNetworkUrl: undefined,
   confirmationObservableTest: undefined,
   selectedTest: undefined,
-  tests: []
+  tests: [],
+  eventLogs: ['dApp started'],
 };
 
 const store = writable(initialState);
 
 const state = {
   subscribe: store.subscribe,
-  updateUserAddress: (address: string) =>
+  updateUserAddress: (address: string | undefined) =>
     store.update(store => ({
       ...store,
       userAddress: address
     })),
-  updateUserBalance: (balance: number) =>
+  updateUserBalance: (balance: number | undefined) =>
     store.update(store => ({
       ...store,
       userBalance: balance
@@ -52,7 +53,7 @@ const state = {
       ...store,
       Tezos
     })),
-  updateWallet: (wallet: BeaconWallet) =>
+  updateWallet: (wallet: BeaconWallet | undefined) =>
     store.update(store => ({
       ...store,
       wallet
@@ -67,7 +68,7 @@ const state = {
       ...store,
       disableDefaultEvents: !store.disableDefaultEvents
     })),
-  updateNetworkType: (networkType: NetworkType, url?: string) =>
+  updateNetworkType: (networkType: SupportedNetworks, url?: string) =>
     store.update(store => ({
       ...store,
       networkType,
@@ -78,7 +79,7 @@ const state = {
       ...store,
       confirmationObservableTest:
         store.confirmationObservableTest &&
-        Array.isArray(store.confirmationObservableTest)
+          Array.isArray(store.confirmationObservableTest)
           ? [...store.confirmationObservableTest, conf]
           : [conf]
     })),
@@ -87,7 +88,7 @@ const state = {
       ...store,
       confirmationObservableTest: undefined
     })),
-  updateSelectedTest: (testId: string) =>
+  updateSelectedTest: (testId: string | undefined) =>
     store.update(store => ({
       ...store,
       selectedTest: testId
@@ -105,7 +106,13 @@ const state = {
           ? { ...test, lastResult: { option: "some", val: res } }
           : test
       )
-    }))
+    })),
+  addEvent: (newEvent: string) =>
+    store.update(store => ({
+      ...store,
+      eventLogs: [...store.eventLogs, newEvent]
+    })),
+  clearEvents: () => store.update(store => ({ ...store, eventLogs: [] })),
 };
 
 export default state;
diff --git a/apps/taquito-test-dapp/src/styles/index.scss b/apps/taquito-test-dapp/src/styles/index.scss
index 88ddc4cdf4..1b7b58122a 100644
--- a/apps/taquito-test-dapp/src/styles/index.scss
+++ b/apps/taquito-test-dapp/src/styles/index.scss
@@ -28,6 +28,7 @@ main {
   position: relative;
   display: grid;
   grid-template-columns: 25% 75%;
+  grid-template-rows: 75% 25%;
   height: 100vh;
   z-index: 10;
 }
diff --git a/apps/taquito-test-dapp/vite.config.ts b/apps/taquito-test-dapp/vite.config.ts
index fd64c70b56..727ae352fe 100644
--- a/apps/taquito-test-dapp/vite.config.ts
+++ b/apps/taquito-test-dapp/vite.config.ts
@@ -3,7 +3,7 @@ import path from "path";
 import { svelte } from "@sveltejs/vite-plugin-svelte";
 
 // https://vitejs.dev/config/
-export default ({ command }) => {
+export default ({ command, mode }) => {
   const isBuild = command === "build";
   return defineConfig({
     plugins: [svelte()],
@@ -29,6 +29,11 @@ export default ({ command }) => {
           }/index.js`
           // `../../node_modules/@airgap/beacon-dapp/dist/walletbeacon.dapp.min.js`
         ),
+        "@airgap/beacon-sdk": path.resolve(
+          path.resolve(),
+          `../../node_modules/@airgap/beacon-sdk/dist/${isBuild ? "esm" : "cjs"
+          }/index.js`
+        ),
         // polyfills
         "readable-stream": "vite-compatible-readable-stream",
         "stream": "vite-compatible-readable-stream"
diff --git a/cspell.json b/cspell.json
index 1d2d48c7fe..88f12bc865 100644
--- a/cspell.json
+++ b/cspell.json
@@ -74,6 +74,7 @@
     "println",
     "Protofire",
     "PtNairobi",
+    "refetched",
     "rollups",
     "Roxane",
     "SAPLINGCONTRACT",
@@ -94,6 +95,7 @@
     "testbox",
     "tezbridge",
     "tezos",
+    "Thanos",
     "ticketer",
     "toolbelt",
     "TORU",
@@ -105,6 +107,7 @@
     "UNPAIR",
     "Unparsing",
     "vals",
+    "walletbeacon",
     "ZARITH"
   ],
   "files": [