Merge pull request #21 from TONSolutions/te-765/fix-wallet

feat: fix bugs and new events
Telemetree · Jan 10, 2025 · 7428f35 · 7428f35
2 parents d96f3aa + 592ae9a
commit 7428f35
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 14 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tonsolutions/telemetree-react",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "main": "./lib/index.сjs",
   "module": "./lib/index.mjs",
   "types": "./lib/index.d.ts",

diff --git a/src/components/TwaAnalyticsProvider.tsx b/src/components/TwaAnalyticsProvider.tsx
@@ -21,6 +21,7 @@ declare global {
       WebView?: Telegram.WebView;
     };
     __telemetreeSessionStarted?: boolean;
+    __telemetreeTonObserverStarted?: boolean;
   }
 }
 
@@ -83,13 +84,16 @@ const TwaAnalyticsProvider: FunctionComponent<TwaAnalyticsProviderProps> = ({
   useEffect(() => {
     let observer: TonConnectObserver | null = null;
 
-    try {
-      observer = new TonConnectObserver(eventBuilder);
-      Logger.info('TON Connect observer initialized successfully');
-    } catch (error) {
-      Logger.error('Failed to initialize TON Connect observer', {
-        error: error instanceof Error ? error.message : 'Unknown error',
-      });
+    if (!window.__telemetreeTonObserverStarted){
+      try {
+        observer = new TonConnectObserver(eventBuilder);
+        window.__telemetreeTonObserverStarted = true;
+        Logger.info('TON Connect observer initialized successfully');
+      } catch (error) {
+        Logger.error('Failed to initialize TON Connect observer', {
+          error: error instanceof Error ? error.message : 'Unknown error',
+        });
+      }
     }
 
     return () => {

diff --git a/src/enum/event-type.enum.ts b/src/enum/event-type.enum.ts
@@ -1,7 +1,6 @@
 export enum EventType {
   Click = 'Click',
   PageView = 'Pageview',
-  Wallet = 'Wallet',
   Closed = 'Closed',
   MainButtonPressed = 'MainButtonPressed',
   SettingsButtonPressed = 'SettingsButtonPressed',
@@ -40,8 +39,8 @@ export enum EventType {
   SessionEnd = 'Session end',
 
   // Wallet events
+  Wallet = 'Wallet',
   WalletConnectStarted = 'Wallet connect started',
-  WalletConnected = 'Wallet connected',
   WalletConnectError = 'Wallet connect error',
   WalletConnectionRestoringStarted = 'Wallet connection restoring started',
   WalletConnectionRestored = 'Wallet connection restored',

diff --git a/src/observers/ton-connect.observer.ts b/src/observers/ton-connect.observer.ts
@@ -19,6 +19,7 @@ interface CustomData {
 }
 
 interface BaseEventDetails {
+  wallet_address?: string;
   wallet_type?: string;
   wallet_version?: string;
   custom_data?: CustomData;
@@ -143,15 +144,14 @@ export class TonConnectObserver {
   ): Promise<void> {
     const config = getConfig();
     Logger.debug('Raw event details:', { eventName, eventDetails }); // Add this debug log
-
     try {
       switch (eventName) {
         case TonConnectEvent.WalletConnectSuccess: {
           const details = eventDetails as WalletConnectionEvent;
           await this.eventBuilder.track(
-            `${config.defaultSystemEventPrefix} ${EventType.WalletConnected}`,
+            `${EventType.Wallet}`,
             {
-              wallet: details?.account?.address,
+              wallet: details?.account?.address || details?.wallet_address,
               provider: details?.wallet?.name || 'unknown',
               chain: details?.account?.chain,
               wallet_type: eventDetails.wallet_type,
@@ -239,7 +239,46 @@ export class TonConnectObserver {
           await this.eventBuilder.track(
             `${config.defaultSystemEventPrefix} ${EventType.WalletDisconnected}`,
             {
-              lastWallet: eventDetails?.wallet,
+              lastWallet: eventDetails?.wallet_address,
+              timestamp: Date.now(),
+            },
+          );
+          break;
+        }
+
+        case TonConnectEvent.ConnectionRestoringError: {
+          await this.eventBuilder.track(
+            `${config.defaultSystemEventPrefix} ${EventType.WalletConnectionRestoreError}`,
+            {
+              wallet_type: eventDetails.wallet_type,
+              wallet_version: eventDetails.wallet_version,
+              wallet: eventDetails?.wallet_address,
+              timestamp: Date.now(),
+            },
+          );
+          break;
+        }
+
+        case TonConnectEvent.ConnectionRestoringSuccess: {
+          await this.eventBuilder.track(
+            `${config.defaultSystemEventPrefix} ${EventType.WalletConnectionRestored}`,
+            {
+              wallet_type: eventDetails.wallet_type,
+              wallet_version: eventDetails.wallet_version,
+              wallet: eventDetails?.wallet_address,
+              timestamp: Date.now(),
+            },
+          );
+          break;
+        }
+
+        case TonConnectEvent.ConnectionRestoringStarted: {
+          await this.eventBuilder.track(
+            `${config.defaultSystemEventPrefix} ${EventType.WalletConnectionRestoringStarted}`,
+            {
+              wallet_type: eventDetails.wallet_type,
+              wallet_version: eventDetails.wallet_version,
+              wallet: eventDetails?.wallet_address,
               timestamp: Date.now(),
             },
           );