@reown/appkit-core-react-native 0.0.0-refactor-modal-migration-20241010184043 → 0.0.0-refactor-modal-migration-20241015194516

package/src/controllers/SendController.ts

@@ -97,7 +97,7 @@ export const SendController = {
         type: 'track',
         event: 'SEND_INITIATED',
         properties: {
-          isSmartAccount: false,
+          isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount',
           token: this.state.token.address,
           amount: this.state.sendTokenAmount,
           network: NetworkController.state.caipNetwork?.id || ''
@@ -120,7 +120,7 @@ export const SendController = {
         type: 'track',
         event: 'SEND_INITIATED',
         properties: {
-          isSmartAccount: false,
+          isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount',
           token: this.state.token?.symbol,
           amount: this.state.sendTokenAmount,
           network: NetworkController.state.caipNetwork?.id || ''
@@ -162,7 +162,7 @@ export const SendController = {
         type: 'track',
         event: 'SEND_SUCCESS',
         properties: {
-          isSmartAccount: false,
+          isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount',
           token: this.state.token?.symbol || '',
           amount: params.sendTokenAmount,
           network: NetworkController.state.caipNetwork?.id || ''
@@ -175,7 +175,7 @@ export const SendController = {
         type: 'track',
         event: 'SEND_ERROR',
         properties: {
-          isSmartAccount: false,
+          isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount',
           token: this.state.token?.symbol || '',
           amount: params.sendTokenAmount,
           network: NetworkController.state.caipNetwork?.id || ''

package/src/controllers/TransactionsController.ts

@@ -5,6 +5,7 @@ import { EventsController } from './EventsController';
 import { SnackController } from './SnackController';
 import { NetworkController } from './NetworkController';
 import { BlockchainApiController } from './BlockchainApiController';
+import { AccountController } from './AccountController';
 
 // -- Types --------------------------------------------- //
 type TransactionByMonthMap = Record<string, Transaction[]>;
@@ -74,7 +75,7 @@ export const TransactionsController = {
           address: accountAddress,
           projectId,
           cursor: state.next,
-          isSmartAccount: false
+          isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount'
         }
       });
       SnackController.showError('Failed to fetch transactions');

package/src/utils/TypeUtil.ts

@@ -56,6 +56,8 @@ export type CaipNamespaces = Record<
   }
 >;
 
+export type SdkType = 'appkit';
+
 export type SdkVersion =
   | `react-native-wagmi-${string}`
   | `react-native-ethers5-${string}`
@@ -375,18 +377,34 @@ export type Event =
   | {
       type: 'track';
       event: 'CLICK_SIGN_SIWE_MESSAGE';
+      properties: {
+        network: string;
+        isSmartAccount: boolean;
+      };
     }
   | {
       type: 'track';
       event: 'CLICK_CANCEL_SIWE';
+      properties: {
+        network: string;
+        isSmartAccount: boolean;
+      };
     }
   | {
       type: 'track';
       event: 'SIWE_AUTH_SUCCESS';
+      properties: {
+        network: string;
+        isSmartAccount: boolean;
+      };
     }
   | {
       type: 'track';
       event: 'SIWE_AUTH_ERROR';
+      properties: {
+        network: string;
+        isSmartAccount: boolean;
+      };
     }
   | {
       type: 'track';
@@ -473,6 +491,14 @@ export type Event =
       properties: {
         provider: SocialProvider;
       };
+    }
+  | {
+      type: 'track';
+      event: 'SET_PREFERRED_ACCOUNT_TYPE';
+      properties: {
+        accountType: AppKitFrameAccountType;
+        network: string;
+      };
     };
 
 // -- Send Controller Types -------------------------------------
@@ -500,6 +526,9 @@ export interface WriteContractArgs {
  * Matches type defined for packages/wallet/src/AppKitFrameProvider.ts
  * It's duplicated in order to decouple scaffold from email package
  */
+
+export type AppKitFrameAccountType = 'eoa' | 'smartAccount';
+
 export interface AppKitFrameProvider {
   readonly id: string;
   readonly name: string;
@@ -510,6 +539,7 @@ export interface AppKitFrameProvider {
   getSecureSiteHeaders(): Record<string, string>;
   getEmail(): string | undefined;
   getUsername(): string | undefined;
+  getLastUsedChainId(): Promise<number | undefined>;
   rejectRpcRequest(): void;
   connectEmail(payload: { email: string }): Promise<{
     action: 'VERIFY_DEVICE' | 'VERIFY_OTP';
@@ -521,7 +551,7 @@ export interface AppKitFrameProvider {
     address: string;
     accounts?:
       | {
-          type: 'eoa' | 'smartAccount';
+          type: AppKitFrameAccountType;
           address: string;
         }[]
       | undefined;
@@ -553,16 +583,26 @@ export interface AppKitFrameProvider {
   syncDappData(payload: {
     projectId: string;
     sdkVersion: SdkVersion;
+    sdkType: SdkType;
     metadata?: Metadata;
   }): Promise<unknown>;
   connect(payload?: { chainId: number | undefined }): Promise<{
     chainId: number;
     email: string;
     address: string;
+    smartAccountDeployed: boolean;
+    preferredAccountType: AppKitFrameAccountType;
   }>;
   switchNetwork(chainId: number): Promise<{
     chainId: number;
   }>;
+  setPreferredAccount(type: AppKitFrameAccountType): Promise<{
+    type: string;
+    address: string;
+  }>;
+  getSmartAccountEnabledNetworks(): Promise<{
+    smartAccountEnabledNetworks: number[];
+  }>;
   disconnect(): Promise<unknown>;
   request(req: any): Promise<any>;
   AuthView: () => JSX.Element | null;