@reown/appkit-core-react-native 0.0.0-feat-multi-social-20250714211631 → 0.0.0-feat-onramp-20250718185718

package/src/controllers/TransactionsController.ts

@@ -1,10 +1,11 @@
-import type { CaipAddress, Transaction } from '@reown/appkit-common-react-native';
-import { proxy, subscribe as sub } from 'valtio/vanilla';
+import type { Transaction } from '@reown/appkit-common-react-native';
+import { proxy, subscribe as sub } from 'valtio';
 import { OptionsController } from './OptionsController';
 import { EventsController } from './EventsController';
 import { SnackController } from './SnackController';
+import { NetworkController } from './NetworkController';
 import { BlockchainApiController } from './BlockchainApiController';
-import { ConnectionsController } from './ConnectionsController';
+import { AccountController } from './AccountController';
 
 // -- Types --------------------------------------------- //
 type TransactionByMonthMap = Record<string, Transaction[]>;
@@ -33,29 +34,22 @@ export const TransactionsController = {
     return sub(state, () => callback(state));
   },
 
-  async fetchTransactions(accountAddress?: CaipAddress, reset?: boolean) {
-    try {
-      const { projectId } = OptionsController.state;
-
-      if (!projectId || !accountAddress) {
-        throw new Error("Transactions can't be fetched without a projectId and an accountAddress");
-      }
+  async fetchTransactions(accountAddress?: string, reset?: boolean) {
+    const { projectId } = OptionsController.state;
 
-      state.loading = true;
-
-      if (reset) {
-        state.next = undefined;
-      }
+    if (!projectId || !accountAddress) {
+      throw new Error("Transactions can't be fetched without a projectId and an accountAddress");
+    }
 
-      const [namespace, chain, address] = accountAddress?.split(':') ?? [];
+    state.loading = true;
 
-      if (!namespace || !chain || !address) {
-        throw new Error('Invalid address');
-      }
+    if (reset) {
+      state.next = undefined;
+    }
 
+    try {
       const response = await BlockchainApiController.fetchTransactions({
-        account: address,
-        chainId: `${namespace}:${chain}`,
+        account: accountAddress,
         projectId,
         cursor: state.next
       });
@@ -78,10 +72,10 @@ export const TransactionsController = {
         type: 'track',
         event: 'ERROR_FETCH_TRANSACTIONS',
         properties: {
-          address: accountAddress ?? '',
-          projectId: OptionsController.state.projectId,
+          address: accountAddress,
+          projectId,
           cursor: state.next,
-          isSmartAccount: ConnectionsController.state.accountType === 'smartAccount'
+          isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount'
         }
       });
       SnackController.showError('Failed to fetch transactions');
@@ -127,7 +121,7 @@ export const TransactionsController = {
   },
 
   filterByConnectedChain(transactions: Transaction[]) {
-    const chainId = ConnectionsController.state.activeCaipNetworkId;
+    const chainId = NetworkController.state.caipNetwork?.id;
     const filteredTransactions = transactions.filter(
       transaction => transaction.metadata.chain === chainId
     );
@@ -139,7 +133,7 @@ export const TransactionsController = {
     state.next = undefined;
   },
 
-  resetState() {
+  resetTransactions() {
     state.transactions = [];
     state.loading = false;
     state.empty = false;

package/src/controllers/WebviewController.ts

@@ -0,0 +1,63 @@
+import type { SocialProvider } from '@reown/appkit-common-react-native';
+import { proxy, subscribe as sub } from 'valtio';
+
+// -- Types --------------------------------------------- //
+export interface WebviewControllerState {
+  frameViewVisible: boolean;
+  webviewVisible: boolean;
+  webviewUrl?: string;
+  connecting?: boolean;
+  connectingProvider?: SocialProvider;
+  processingAuth?: boolean;
+}
+
+// -- State --------------------------------------------- //
+const state = proxy<WebviewControllerState>({
+  frameViewVisible: false,
+  webviewVisible: false,
+  connecting: false,
+  connectingProvider: undefined,
+  processingAuth: false
+});
+
+// -- Controller ---------------------------------------- //
+export const WebviewController = {
+  state,
+
+  subscribe(callback: (newState: WebviewControllerState) => void) {
+    return sub(state, () => callback(state));
+  },
+
+  setFrameViewVisible(frameViewVisible: WebviewControllerState['frameViewVisible']) {
+    state.frameViewVisible = frameViewVisible;
+  },
+
+  setWebviewVisible(visible: WebviewControllerState['webviewVisible']) {
+    state.webviewVisible = visible;
+  },
+
+  setWebviewUrl(url: WebviewControllerState['webviewUrl']) {
+    state.webviewUrl = url;
+  },
+
+  setConnecting(connecting: WebviewControllerState['connecting']) {
+    state.connecting = connecting;
+  },
+
+  setConnectingProvider(provider: WebviewControllerState['connectingProvider']) {
+    state.connectingProvider = provider;
+  },
+
+  setProcessingAuth(processingAuth: WebviewControllerState['processingAuth']) {
+    state.processingAuth = processingAuth;
+  },
+
+  reset() {
+    state.frameViewVisible = false;
+    state.webviewVisible = false;
+    state.connecting = false;
+    state.connectingProvider = undefined;
+    state.processingAuth = false;
+    state.webviewUrl = undefined;
+  }
+};

package/src/index.ts

@@ -22,9 +22,9 @@ export {
 } from './controllers/ConnectionController';
 
 export {
-  ConnectionsController,
-  type ConnectionsControllerState
-} from './controllers/ConnectionsController';
+  ConnectorController,
+  type ConnectorControllerState
+} from './controllers/ConnectorController';
 
 export { SnackController, type SnackControllerState } from './controllers/SnackController';
 
@@ -57,14 +57,17 @@ export {
 export { SendController, type SendControllerState } from './controllers/SendController';
 
 export { OnRampController, type OnRampControllerState } from './controllers/OnRampController';
+export { WebviewController, type WebviewControllerState } from './controllers/WebviewController';
 
 // -- Utils -------------------------------------------------------------------
 export { ApiUtil } from './utils/ApiUtil';
 export { AssetUtil } from './utils/AssetUtil';
+export { ConnectionUtil } from './utils/ConnectionUtil';
 export { ConstantsUtil } from './utils/ConstantsUtil';
 export { CoreHelperUtil } from './utils/CoreHelperUtil';
 export { StorageUtil } from './utils/StorageUtil';
 export { EventUtil } from './utils/EventUtil';
 export { RouterUtil } from './utils/RouterUtil';
+export { NetworkUtil } from './utils/NetworkUtil';
 
 export type * from './utils/TypeUtil';

package/src/utils/AssetUtil.ts

@@ -1,5 +1,5 @@
 import { AssetController } from '../controllers/AssetController';
-import type { WcWallet } from './TypeUtil';
+import type { CaipNetwork, Connector, WcWallet } from './TypeUtil';
 
 export const AssetUtil = {
   getWalletImage(wallet?: WcWallet) {
@@ -14,19 +14,25 @@ export const AssetUtil = {
     return undefined;
   },
 
-  getNetworkImage(networkId?: string | number) {
-    //TODO: check if imageUrl case is needed
+  getNetworkImage(network?: CaipNetwork) {
+    if (network?.imageUrl) {
+      return network?.imageUrl;
+    }
 
-    if (networkId) {
-      return AssetController.state.networkImages[networkId];
+    if (network?.imageId) {
+      return AssetController.state.networkImages[network.imageId];
     }
 
     return undefined;
   },
 
-  getConnectorImage(imageId?: string) {
-    if (imageId) {
-      return AssetController.state.connectorImages[imageId];
+  getConnectorImage(connector?: Connector) {
+    if (connector?.imageUrl) {
+      return connector.imageUrl;
+    }
+
+    if (connector?.imageId) {
+      return AssetController.state.connectorImages[connector.imageId];
     }
 
     return undefined;

package/src/utils/ConnectionUtil.ts

@@ -0,0 +1,27 @@
+import { AccountController } from '../controllers/AccountController';
+import { ConnectionController } from '../controllers/ConnectionController';
+import { EventsController } from '../controllers/EventsController';
+import { ModalController } from '../controllers/ModalController';
+import { RouterController } from '../controllers/RouterController';
+import { TransactionsController } from '../controllers/TransactionsController';
+
+export const ConnectionUtil = {
+  async disconnect() {
+    try {
+      await ConnectionController.disconnect();
+      ModalController.close();
+      AccountController.setIsConnected(false);
+      RouterController.reset('Connect');
+      TransactionsController.resetTransactions();
+      EventsController.sendEvent({
+        type: 'track',
+        event: 'DISCONNECT_SUCCESS'
+      });
+    } catch (error) {
+      EventsController.sendEvent({
+        type: 'track',
+        event: 'DISCONNECT_ERROR'
+      });
+    }
+  }
+};