Update analytics

tonkeeper · Dec 30, 2023 · da9282f · da9282f
1 parent c8e14b8
commit da9282f
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 18 deletions.
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@tonkeeper/desktop",
-    "version": "3.4.8",
+    "version": "3.4.9",
     "description": "Your desktop wallet on The Open Network",
     "main": ".webpack/main",
     "repository": {

diff --git a/apps/desktop/src/app/App.tsx b/apps/desktop/src/app/App.tsx
@@ -139,7 +139,7 @@ export const Loader: FC = () => {
     const navigate = useNavigate();
     useAppHeight();
 
-    const { data: tracker } = useAnalytics(sdk.storage, account, activeWallet);
+    const { data: tracker } = useAnalytics(account, activeWallet);
 
     useEffect(() => {
         if (

diff --git a/apps/desktop/src/libs/hooks.ts b/apps/desktop/src/libs/hooks.ts
@@ -1,5 +1,4 @@
 import { useQuery } from '@tanstack/react-query';
-import { IStorage } from '@tonkeeper/core/dist/Storage';
 import { AccountState } from '@tonkeeper/core/dist/entries/account';
 import { WalletState } from '@tonkeeper/core/dist/entries/wallet';
 import { throttle } from '@tonkeeper/core/dist/utils/common';
@@ -45,22 +44,18 @@ export const useAppWidth = () => {
 
 declare const REACT_APP_MEASUREMENT_ID: string;
 
-export const useAnalytics = (
-    storage: IStorage,
-    account?: AccountState,
-    wallet?: WalletState | null
-) => {
+export const useAnalytics = (account?: AccountState, wallet?: WalletState | null) => {
     return useQuery<Analytics>(
         [QueryKey.analytics],
         async () => {
             const tracker = new Gtag(REACT_APP_MEASUREMENT_ID);
-            const version = `Desktop-${window.backgroundApi.platform()}-${window.backgroundApi.arch()}`;
             tracker.init(
-                version,
+                'Desktop',
                 toWalletType(wallet),
                 account,
                 wallet,
-                window.backgroundApi.version()
+                window.backgroundApi.version(),
+                `${window.backgroundApi.platform()}-${window.backgroundApi.arch()}`
             );
 
             return tracker;

diff --git a/packages/uikit/src/hooks/analytics/amplitude.ts b/packages/uikit/src/hooks/analytics/amplitude.ts
@@ -12,7 +12,8 @@ export class Amplitude implements Analytics {
         walletType: string,
         account?: AccountState,
         wallet?: WalletState | null,
-        version?: string
+        version?: string,
+        platform?: string
     ) {
         amplitude.init(this.key, undefined, {
             defaultTracking: {
@@ -29,6 +30,7 @@ export class Amplitude implements Analytics {
         event.set('network', wallet?.network === Network.TESTNET ? 'testnet' : 'mainnet');
         event.set('accounts', account!.publicKeys.length);
         event.set('version', version ?? 'Unknown');
+        event.set('platform', platform ?? 'Unknown');
 
         amplitude.identify(event);
     }

diff --git a/packages/uikit/src/hooks/analytics/google.ts b/packages/uikit/src/hooks/analytics/google.ts
@@ -35,7 +35,8 @@ export class GoogleAnalytics4 implements Analytics {
         walletType: string,
         account?: AccountState,
         wallet?: WalletState | null,
-        version?: string
+        version?: string,
+        platform?: string
     ) {
         this.user_properties['application'] = { value: application };
         this.user_properties['walletType'] = { value: walletType };
@@ -44,6 +45,7 @@ export class GoogleAnalytics4 implements Analytics {
         };
         this.user_properties['accounts'] = { value: account!.publicKeys.length };
         this.user_properties['version'] = { value: version };
+        this.user_properties['platform'] = { value: platform };
     }
 
     pageView(location: string) {

diff --git a/packages/uikit/src/hooks/analytics/gtag.ts b/packages/uikit/src/hooks/analytics/gtag.ts
@@ -14,14 +14,16 @@ export class Gtag implements Analytics {
         walletType: string,
         account?: AccountState,
         wallet?: WalletState | null,
-        version?: string
+        version?: string,
+        platform?: string
     ) {
         ReactGA.gtag('set', 'user_properties', {
             application,
             walletType,
             network: wallet?.network === Network.TESTNET ? 'testnet' : 'mainnet',
             accounts: account!.publicKeys.length,
-            version
+            version,
+            platform
         });
     }
 

diff --git a/packages/uikit/src/hooks/analytics/index.ts b/packages/uikit/src/hooks/analytics/index.ts
@@ -9,7 +9,8 @@ export interface Analytics {
         walletType: string,
         account?: AccountState,
         wallet?: WalletState | null,
-        version?: string
+        version?: string,
+        platform?: string
     ) => void;
     track: (name: string, params: Record<string, any>) => Promise<void>;
 }
@@ -29,9 +30,12 @@ export class AnalyticsGroup implements Analytics {
         walletType: string,
         account?: AccountState,
         wallet?: WalletState | null,
-        version?: string
+        version?: string,
+        platform?: string
     ) {
-        this.analytics.forEach(c => c.init(application, walletType, account, wallet, version));
+        this.analytics.forEach(c =>
+            c.init(application, walletType, account, wallet, version, platform)
+        );
     }
 
     async track(name: string, params: Record<string, any>) {