@reown/appkit-core-react-native 0.0.0-develop-20250728141602 → 0.0.0-develop-20251008155354

package/src/controllers/SwapController.ts

@@ -1,22 +1,25 @@
 import { subscribeKey as subKey } from 'valtio/utils';
 import { proxy, subscribe as sub } from 'valtio';
-import { NumberUtil } from '@reown/appkit-common-react-native';
+import {
+  NumberUtil,
+  type CaipAddress,
+  type CaipNetworkId,
+  type SwapInputTarget,
+  type SwapTokenWithBalance
+} from '@reown/appkit-common-react-native';
 
 import { ConstantsUtil } from '../utils/ConstantsUtil';
 import { SwapApiUtil } from '../utils/SwapApiUtil';
-import { NetworkController } from './NetworkController';
 import { BlockchainApiController } from './BlockchainApiController';
 import { OptionsController } from './OptionsController';
 import { SwapCalculationUtil } from '../utils/SwapCalculationUtil';
 import { SnackController } from './SnackController';
+import { LogController } from './LogController';
 import { RouterController } from './RouterController';
-import type { SwapInputTarget, SwapTokenWithBalance } from '../utils/TypeUtil';
-import { ConnectorController } from './ConnectorController';
-import { AccountController } from './AccountController';
 import { CoreHelperUtil } from '../utils/CoreHelperUtil';
-import { ConnectionController } from './ConnectionController';
 import { TransactionsController } from './TransactionsController';
 import { EventsController } from './EventsController';
+import { ConnectionsController } from './ConnectionsController';
 
 // -- Constants ---------------------------------------- //
 export const INITIAL_GAS_LIMIT = 150000;
@@ -44,8 +47,7 @@ class TransactionError extends Error {
 
 export interface SwapControllerState {
   // Loading states
-  initializing: boolean;
-  initialized: boolean;
+  loadingTokens: boolean;
   loadingPrices: boolean;
   loadingQuote?: boolean;
   loadingApprovalTransaction?: boolean;
@@ -68,7 +70,6 @@ export interface SwapControllerState {
   toTokenAmount: string;
   toTokenPriceInUSD: number;
   networkPrice: string;
-  networkBalanceInUSD: string;
   networkTokenSymbol: string;
   inputError: string | undefined;
 
@@ -96,8 +97,7 @@ type StateKey = keyof SwapControllerState;
 // -- State --------------------------------------------- //
 const initialState: SwapControllerState = {
   // Loading states
-  initializing: false,
-  initialized: false,
+  loadingTokens: false,
   loadingPrices: false,
   loadingQuote: false,
   loadingApprovalTransaction: false,
@@ -120,7 +120,6 @@ const initialState: SwapControllerState = {
   toTokenAmount: '',
   toTokenPriceInUSD: 0,
   networkPrice: '0',
-  networkBalanceInUSD: '0',
   networkTokenSymbol: '',
   inputError: undefined,
 
@@ -143,7 +142,7 @@ const initialState: SwapControllerState = {
   providerFee: undefined
 };
 
-const state = proxy<SwapControllerState>(initialState);
+const state = proxy<SwapControllerState>({ ...initialState });
 
 // -- Controller ---------------------------------------- //
 export const SwapController = {
@@ -158,10 +157,15 @@ export const SwapController = {
   },
 
   getParams() {
-    const caipAddress = AccountController.state.caipAddress;
-    const address = CoreHelperUtil.getPlainAddress(caipAddress);
-    const networkAddress = NetworkController.getActiveNetworkTokenAddress();
-    const type = ConnectorController.state.connectedConnector;
+    const { activeAddress, activeNamespace, activeNetwork, connection } =
+      ConnectionsController.state;
+    const address = CoreHelperUtil.getPlainAddress(activeAddress);
+
+    if (!activeNamespace || !activeNetwork) {
+      throw new Error('No active namespace or network found to swap the tokens from.');
+    }
+
+    const networkAddress: CaipAddress = `${activeNetwork.caipNetworkId}:${ConstantsUtil.NATIVE_TOKEN_ADDRESS[activeNamespace]}`;
 
     if (!address) {
       throw new Error('No address found to swap the tokens from.');
@@ -177,8 +181,9 @@ export const SwapController = {
 
     return {
       networkAddress,
+      network: activeNetwork,
       fromAddress: address,
-      fromCaipAddress: caipAddress,
+      fromCaipAddress: activeAddress,
       sourceTokenAddress: state.sourceToken?.address,
       toTokenAddress: state.toToken?.address,
       toTokenAmount: state.toTokenAmount,
@@ -189,13 +194,13 @@ export const SwapController = {
       invalidSourceToken,
       invalidSourceTokenAmount,
       availableToSwap:
-        caipAddress && !invalidToToken && !invalidSourceToken && !invalidSourceTokenAmount,
-      isAuthConnector: type === 'AUTH'
+        activeAddress && !invalidToToken && !invalidSourceToken && !invalidSourceTokenAmount,
+      isAuthConnector: !!connection?.properties?.provider
     };
   },
 
   switchTokens() {
-    if (state.initializing || !state.initialized) {
+    if (state.loadingTokens) {
       return;
     }
 
@@ -220,41 +225,37 @@ export const SwapController = {
     this.swapTokens();
   },
 
-  resetState() {
-    state.myTokensWithBalance = initialState.myTokensWithBalance;
-    state.tokensPriceMap = initialState.tokensPriceMap;
-    state.initialized = initialState.initialized;
-    state.sourceToken = initialState.sourceToken;
-    state.sourceTokenAmount = initialState.sourceTokenAmount;
-    state.sourceTokenPriceInUSD = initialState.sourceTokenPriceInUSD;
-    state.toToken = initialState.toToken;
-    state.toTokenAmount = initialState.toTokenAmount;
-    state.toTokenPriceInUSD = initialState.toTokenPriceInUSD;
-    state.networkPrice = initialState.networkPrice;
-    state.networkTokenSymbol = initialState.networkTokenSymbol;
-    state.networkBalanceInUSD = initialState.networkBalanceInUSD;
-    state.inputError = initialState.inputError;
-  },
-
   async fetchTokens() {
-    const { networkAddress } = this.getParams();
+    try {
+      const { networkAddress } = this.getParams();
 
-    await this.getTokenList();
-    await this.getNetworkTokenPrice();
-    await this.getMyTokensWithBalance();
+      state.loadingTokens = true;
+      await this.getTokenList();
+      await this.getNetworkTokenPrice();
+      await this.getMyTokensWithBalance();
 
-    const networkToken = state.tokens?.find(token => token.address === networkAddress);
+      const networkToken = state.tokens?.find(token => token.address === networkAddress);
 
-    if (networkToken) {
-      state.networkTokenSymbol = networkToken.symbol;
-    }
+      if (networkToken) {
+        state.networkTokenSymbol = networkToken.symbol;
+      }
 
-    const sourceToken =
-      state.myTokensWithBalance?.find(token => token.address.startsWith(networkAddress)) ||
-      state.myTokensWithBalance?.[0];
+      // Set default source token if not set
+      if (!state.sourceToken && state.myTokensWithBalance?.length) {
+        const sourceToken =
+          state.myTokensWithBalance?.find(token => token.address.startsWith(networkAddress)) ||
+          state.myTokensWithBalance?.[0];
 
-    this.setSourceToken(sourceToken);
-    this.setSourceTokenAmount('1');
+        this.setSourceToken(sourceToken);
+        this.setSourceTokenAmount('1');
+      }
+    } catch (error) {
+      LogController.sendError(error, 'SwapController.ts', 'initializeState');
+      SnackController.showError('Failed to initialize swap');
+      RouterController.goBack();
+    } finally {
+      state.loadingTokens = false;
+    }
   },
 
   async getTokenList() {
@@ -280,21 +281,23 @@ export const SwapController = {
     }, {});
   },
 
-  async getMyTokensWithBalance(forceUpdate?: string) {
-    const balances = await SwapApiUtil.getMyTokensWithBalance(forceUpdate);
-
-    if (!balances) {
+  async getMyTokensWithBalance(forceUpdate?: CaipAddress[]) {
+    await ConnectionsController.fetchBalance(forceUpdate);
+    const swapBalances = SwapApiUtil.mapBalancesToSwapTokens(ConnectionsController.state.balances);
+    if (!swapBalances) {
       return;
     }
 
     await this.getInitialGasPrice();
-    this.setBalances(balances);
+    this.setBalances(swapBalances);
   },
 
-  getFilteredPopularTokens() {
-    return state.popularTokens?.filter(
-      token => !state.myTokensWithBalance?.some(t => t.address === token.address)
-    );
+  getFilteredPopularTokens(balances?: SwapTokenWithBalance[]) {
+    if (!balances) {
+      return state.popularTokens;
+    }
+
+    return state.popularTokens?.filter(token => !balances.some(t => t.address === token.address));
   },
 
   setSourceToken(sourceToken: SwapTokenWithBalance | undefined) {
@@ -318,26 +321,10 @@ export const SwapController = {
     }
   },
 
-  async initializeState() {
-    if (state.initializing) {
-      return;
-    }
+  async getAddressPrice(address: CaipAddress) {
+    const [namespace, chain] = address.split(':');
+    const networkId: CaipNetworkId = `${namespace}:${chain}`;
 
-    state.initializing = true;
-    if (!state.initialized) {
-      try {
-        await this.fetchTokens();
-        state.initialized = true;
-      } catch (error) {
-        state.initialized = false;
-        SnackController.showError('Failed to initialize swap');
-        RouterController.goBack();
-      }
-    }
-    state.initializing = false;
-  },
-
-  async getAddressPrice(address: string) {
     const existPrice = state.tokensPriceMap[address];
 
     if (existPrice) {
@@ -346,7 +333,8 @@ export const SwapController = {
 
     const response = await BlockchainApiController.fetchTokenPrice({
       projectId: OptionsController.state.projectId,
-      addresses: [address]
+      addresses: [address],
+      caipNetworkId: networkId
     });
     const fungibles = response?.fungibles || [];
     const allTokens = [...(state.tokens || []), ...(state.myTokensWithBalance || [])];
@@ -361,10 +349,13 @@ export const SwapController = {
 
   async getNetworkTokenPrice() {
     const { networkAddress } = this.getParams();
+    const [namespace, chain] = networkAddress.split(':');
+    const networkId: CaipNetworkId = `${namespace}:${chain}`;
 
     const response = await BlockchainApiController.fetchTokenPrice({
       projectId: OptionsController.state.projectId,
-      addresses: [networkAddress]
+      addresses: [networkAddress],
+      caipNetworkId: networkId
     });
 
     const token = response?.fungibles?.[0];
@@ -400,24 +391,11 @@ export const SwapController = {
   },
 
   setBalances(balances: SwapTokenWithBalance[]) {
-    const { networkAddress } = this.getParams();
-    const caipNetwork = NetworkController.state.caipNetwork;
-
-    if (!caipNetwork) {
-      return;
-    }
-
-    const networkToken = balances.find(token => token.address === networkAddress);
+    state.myTokensWithBalance = balances;
 
     balances.forEach(token => {
       state.tokensPriceMap[token.address] = token.price || 0;
     });
-
-    state.myTokensWithBalance = balances.filter(token => token.address?.startsWith(caipNetwork.id));
-
-    state.networkBalanceInUSD = networkToken
-      ? NumberUtil.multiply(networkToken.quantity.numeric, networkToken.price).toString()
-      : '0';
   },
 
   setToToken(toToken: SwapTokenWithBalance | undefined) {
@@ -439,7 +417,7 @@ export const SwapController = {
       : '';
   },
 
-  async setTokenPrice(address: string, target: SwapInputTarget) {
+  async setTokenPrice(address: CaipAddress, target: SwapInputTarget) {
     let price = state.tokensPriceMap[address] || 0;
 
     if (!price) {
@@ -464,12 +442,12 @@ export const SwapController = {
 
   // -- Swap ---------------------------------------------- //
   async swapTokens() {
-    const address = AccountController.state.address as `${string}:${string}:${string}`;
+    const address = ConnectionsController.state.activeAddress;
     const sourceToken = state.sourceToken;
     const toToken = state.toToken;
     const haveSourceTokenAmount = NumberUtil.bigNumber(state.sourceTokenAmount).isGreaterThan(0);
 
-    if (!toToken || !sourceToken || state.loadingPrices || !haveSourceTokenAmount) {
+    if (!toToken || !sourceToken || state.loadingPrices || !haveSourceTokenAmount || !address) {
       return;
     }
 
@@ -479,39 +457,46 @@ export const SwapController = {
       .multipliedBy(10 ** sourceToken.decimals)
       .integerValue();
 
-    const quoteResponse = await BlockchainApiController.fetchSwapQuote({
-      userAddress: address,
-      projectId: OptionsController.state.projectId,
-      from: sourceToken.address,
-      to: toToken.address,
-      gasPrice: state.gasFee,
-      amount: amountDecimal.toString()
-    });
+    try {
+      const quoteResponse = await BlockchainApiController.fetchSwapQuote({
+        userAddress: address,
+        projectId: OptionsController.state.projectId,
+        from: sourceToken.address,
+        to: toToken.address,
+        gasPrice: state.gasFee,
+        amount: amountDecimal.toString()
+      });
 
-    state.loadingQuote = false;
+      const quoteToAmount = quoteResponse?.quotes?.[0]?.toAmount;
 
-    const quoteToAmount = quoteResponse?.quotes?.[0]?.toAmount;
+      if (!quoteToAmount) {
+        state.loadingQuote = false;
 
-    if (!quoteToAmount) {
-      return;
-    }
+        return;
+      }
 
-    const toTokenAmount = NumberUtil.bigNumber(quoteToAmount)
-      .dividedBy(10 ** toToken.decimals)
-      .toString();
+      const toTokenAmount = NumberUtil.bigNumber(quoteToAmount)
+        .dividedBy(10 ** toToken.decimals)
+        .toString();
 
-    this.setToTokenAmount(toTokenAmount);
+      this.setToTokenAmount(toTokenAmount);
 
-    const isInsufficientToken = this.hasInsufficientToken(
-      state.sourceTokenAmount,
-      sourceToken.address
-    );
+      const isInsufficientToken = this.hasInsufficientToken(
+        state.sourceTokenAmount,
+        sourceToken.address
+      );
 
-    if (isInsufficientToken) {
-      state.inputError = 'Insufficient balance';
-    } else {
-      state.inputError = undefined;
-      this.setTransactionDetails();
+      if (isInsufficientToken) {
+        state.inputError = 'Insufficient balance';
+      } else {
+        state.inputError = undefined;
+        this.setTransactionDetails();
+      }
+    } catch (error) {
+      LogController.sendError(error, 'SwapController.ts', 'getQuote');
+      SnackController.showError('Failed to get swap quote');
+    } finally {
+      state.loadingQuote = false;
     }
   },
 
@@ -580,7 +565,7 @@ export const SwapController = {
       if (!response) {
         throw new Error('createAllowanceTransaction - No response from generateApproveCalldata');
       }
-      const gasLimit = await ConnectionController.estimateGas({
+      const gasLimit = await ConnectionsController.estimateGas({
         address: fromAddress as `0x${string}`,
         to: CoreHelperUtil.getPlainAddress(response.tx.to) as `0x${string}`,
         data: response.tx.data
@@ -633,7 +618,7 @@ export const SwapController = {
       return undefined;
     }
 
-    const amount = ConnectionController.parseUnits(
+    const amount = ConnectionsController.parseUnits(
       sourceTokenAmount,
       sourceToken.decimals
     )?.toString();
@@ -683,42 +668,32 @@ export const SwapController = {
   },
 
   async sendTransactionForApproval(data: TransactionParams) {
-    const { fromAddress, isAuthConnector } = this.getParams();
-
+    const { fromAddress, network } = this.getParams();
     state.loadingApprovalTransaction = true;
-    const approveLimitMessage = `Approve limit increase in your wallet`;
-
-    if (isAuthConnector) {
-      RouterController.pushTransactionStack({
-        view: null,
-        goBack: true,
-        onSuccess() {
-          SnackController.showLoading(approveLimitMessage);
-        }
-      });
-    } else {
-      SnackController.showLoading(approveLimitMessage);
-    }
+
+    SnackController.showLoading('Approve limit increase in your wallet');
 
     try {
-      await ConnectionController.sendTransaction({
+      await ConnectionsController.sendTransaction({
         address: fromAddress as `0x${string}`,
         to: data.to as `0x${string}`,
         data: data.data as `0x${string}`,
         value: BigInt(data.value),
         gasPrice: BigInt(data.gasPrice),
-        chainNamespace: 'eip155'
+        chainNamespace: ConnectionsController.state.activeNamespace,
+        network
       });
 
       await this.swapTokens();
       await this.getTransaction();
       state.approvalTransaction = undefined;
-      state.loadingApprovalTransaction = false;
     } catch (err) {
       const error = err as TransactionError;
       state.transactionError = error?.shortMessage as unknown as string;
-      state.loadingApprovalTransaction = false;
+
       SnackController.showError(error?.shortMessage ?? 'Transaction error');
+    } finally {
+      state.loadingApprovalTransaction = false;
     }
   },
 
@@ -726,73 +701,63 @@ export const SwapController = {
     if (!data) {
       return undefined;
     }
-
-    const { fromAddress, toTokenAmount, isAuthConnector } = this.getParams();
+    const { fromAddress, isAuthConnector, network } = this.getParams();
 
     state.loadingTransaction = true;
 
-    const snackbarPendingMessage = `Swapping ${state.sourceToken
-      ?.symbol} to ${NumberUtil.formatNumberToLocalString(toTokenAmount, 3)} ${state.toToken
-      ?.symbol}`;
-    const snackbarSuccessMessage = `Swapped ${state.sourceToken
-      ?.symbol} to ${NumberUtil.formatNumberToLocalString(toTokenAmount, 3)} ${state.toToken
-      ?.symbol}`;
-
-    if (isAuthConnector) {
-      RouterController.pushTransactionStack({
-        view: 'Account',
-        goBack: false,
-        onSuccess() {
-          SnackController.showLoading(snackbarPendingMessage);
-          SwapController.resetState();
-        }
-      });
-    } else {
-      SnackController.showLoading('Confirm transaction in your wallet');
-    }
+    const snackbarSuccessMessage = `Swapped ${state.sourceToken?.symbol} to ${state.toToken?.symbol}`;
+
+    SnackController.showLoading('Confirm transaction in your wallet');
 
     try {
-      const forceUpdateAddresses = [state.sourceToken?.address, state.toToken?.address].join(',');
-      const transactionHash = await ConnectionController.sendTransaction({
+      const forceUpdateAddresses = [state.sourceToken?.address, state.toToken?.address].filter(
+        Boolean
+      ) as CaipAddress[];
+
+      const transactionHash = await ConnectionsController.sendTransaction({
         address: fromAddress as `0x${string}`,
         to: data.to as `0x${string}`,
         data: data.data as `0x${string}`,
         gas: data.gas,
         gasPrice: BigInt(data.gasPrice),
         value: data.value,
-        chainNamespace: 'eip155'
+        chainNamespace: ConnectionsController.state.activeNamespace,
+        network
       });
 
       state.loadingTransaction = false;
-      SnackController.showSuccess(snackbarSuccessMessage);
+
+      SnackController.showSuccess(snackbarSuccessMessage, true);
       EventsController.sendEvent({
         type: 'track',
         event: 'SWAP_SUCCESS',
         properties: {
-          network: NetworkController.state.caipNetwork?.id || '',
+          network: ConnectionsController.state.activeNetwork?.caipNetworkId,
           swapFromToken: this.state.sourceToken?.symbol || '',
           swapToToken: this.state.toToken?.symbol || '',
           swapFromAmount: this.state.sourceTokenAmount || '',
           swapToAmount: this.state.toTokenAmount || '',
-          isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount'
+          isSmartAccount: ConnectionsController.state.accountType === 'smartAccount'
         }
       });
-      SwapController.resetState();
-
-      if (!isAuthConnector) {
-        RouterController.replace('AccountDefault');
-      }
-
+      RouterController.replace(isAuthConnector ? 'Account' : 'AccountDefault');
+      SwapController.clearTokens();
       SwapController.getMyTokensWithBalance(forceUpdateAddresses);
-      AccountController.fetchTokenBalance();
 
       setTimeout(() => {
-        TransactionsController.fetchTransactions(AccountController.state.address, true);
+        if (ConnectionsController.state.activeAddress) {
+          TransactionsController.fetchTransactions(ConnectionsController.state.activeAddress, true);
+        }
       }, 5000);
 
       return transactionHash;
     } catch (err) {
       const error = err as TransactionError;
+      LogController.sendError(error, 'SwapController.ts', 'sendTransactionForSwap', {
+        sourceToken: this.state.sourceToken?.symbol,
+        toToken: this.state.toToken?.symbol,
+        amount: this.state.sourceTokenAmount
+      });
       state.transactionError = error?.shortMessage;
       state.loadingTransaction = false;
       SnackController.showError(error?.shortMessage ?? 'Transaction error');
@@ -801,12 +766,12 @@ export const SwapController = {
         event: 'SWAP_ERROR',
         properties: {
           message: error?.shortMessage ?? error?.message ?? 'Unknown',
-          network: NetworkController.state.caipNetwork?.id || '',
+          network: ConnectionsController.state.activeNetwork?.caipNetworkId,
           swapFromToken: this.state.sourceToken?.symbol || '',
           swapToToken: this.state.toToken?.symbol || '',
           swapFromAmount: this.state.sourceTokenAmount || '',
           swapToAmount: this.state.toTokenAmount || '',
-          isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount'
+          isSmartAccount: ConnectionsController.state.accountType === 'smartAccount'
         }
       });
 
@@ -814,8 +779,45 @@ export const SwapController = {
     }
   },
 
+  clearTransactionLoaders() {
+    state.loadingApprovalTransaction = false;
+    state.loadingBuildTransaction = false;
+    state.loadingTransaction = false;
+  },
+
+  clearTokens() {
+    state.sourceToken = initialState.sourceToken;
+    state.sourceTokenAmount = initialState.sourceTokenAmount;
+    state.sourceTokenPriceInUSD = initialState.sourceTokenPriceInUSD;
+    state.toToken = initialState.toToken;
+    state.toTokenAmount = initialState.toTokenAmount;
+    state.toTokenPriceInUSD = initialState.toTokenPriceInUSD;
+    state.inputError = initialState.inputError;
+    state.loadingApprovalTransaction = initialState.loadingApprovalTransaction;
+    state.loadingBuildTransaction = initialState.loadingBuildTransaction;
+    state.loadingTransaction = initialState.loadingTransaction;
+    state.fetchError = initialState.fetchError;
+    state.transactionError = initialState.transactionError;
+    state.swapTransaction = initialState.swapTransaction;
+    state.approvalTransaction = initialState.approvalTransaction;
+  },
+
+  resetState() {
+    this.clearTokens();
+    state.myTokensWithBalance = initialState.myTokensWithBalance;
+    state.tokensPriceMap = initialState.tokensPriceMap;
+    state.networkPrice = initialState.networkPrice;
+    state.networkTokenSymbol = initialState.networkTokenSymbol;
+  },
+
   // -- Checks -------------------------------------------- //
   hasInsufficientToken(sourceTokenAmount: string, sourceTokenAddress: string) {
+    const { balances } = ConnectionsController.state;
+    const networkToken = balances?.find(t => t.address === undefined);
+    const networkBalanceInUSD = networkToken
+      ? NumberUtil.multiply(networkToken.quantity?.numeric ?? '0', networkToken.price).toString()
+      : '0';
+
     const isInsufficientSourceTokenForSwap = SwapCalculationUtil.isInsufficientSourceTokenForSwap(
       sourceTokenAmount,
       sourceTokenAddress,
@@ -823,12 +825,12 @@ export const SwapController = {
     );
 
     let insufficientNetworkTokenForGas = true;
-    if (AccountController.state.preferredAccountType === 'smartAccount') {
+    if (ConnectionsController.state.accountType === 'smartAccount') {
       // Smart Accounts may pay gas in any ERC20 token
       insufficientNetworkTokenForGas = false;
     } else {
       insufficientNetworkTokenForGas = SwapCalculationUtil.isInsufficientNetworkTokenForGas(
-        state.networkBalanceInUSD,
+        networkBalanceInUSD,
         state.gasPriceInUSD
       );
     }

package/src/controllers/ThemeController.ts

@@ -1,15 +1,18 @@
+import { Appearance } from 'react-native';
 import { proxy, subscribe as sub } from 'valtio';
 import type { ThemeMode, ThemeVariables } from '@reown/appkit-common-react-native';
 
 // -- Types --------------------------------------------- //
 export interface ThemeControllerState {
   themeMode?: ThemeMode;
-  themeVariables: ThemeVariables;
+  defaultThemeMode?: ThemeMode;
+  themeVariables?: ThemeVariables;
 }
 
 // -- State --------------------------------------------- //
 const state = proxy<ThemeControllerState>({
   themeMode: undefined,
+  defaultThemeMode: undefined,
   themeVariables: {}
 });
 
@@ -22,10 +25,23 @@ export const ThemeController = {
   },
 
   setThemeMode(themeMode: ThemeControllerState['themeMode']) {
-    state.themeMode = themeMode;
+    if (!themeMode) {
+      state.themeMode = Appearance.getColorScheme() as ThemeMode;
+    } else {
+      state.themeMode = themeMode;
+    }
+  },
+
+  setDefaultThemeMode(themeMode: ThemeControllerState['defaultThemeMode']) {
+    state.defaultThemeMode = themeMode;
+    this.setThemeMode(themeMode);
   },
 
   setThemeVariables(themeVariables: ThemeControllerState['themeVariables']) {
+    if (!themeVariables) {
+      state.themeVariables = {};
+    }
+
     state.themeVariables = { ...state.themeVariables, ...themeVariables };
   }
 };