@reown/appkit-core-react-native 2.0.0-alpha.0 → 2.0.0-alpha.2

package/lib/module/controllers/SendController.js

@@ -1,13 +1,14 @@
-import { subscribeKey as subKey } from 'valtio/vanilla/utils';
-import { proxy, ref, subscribe as sub } from 'valtio/vanilla';
+"use strict";
+
+import { subscribeKey as subKey } from 'valtio/utils';
+import { proxy, ref, subscribe as sub } from 'valtio';
 import { ContractUtil } from '@reown/appkit-common-react-native';
-import { AccountController } from './AccountController';
-import { ConnectionController } from './ConnectionController';
 import { SnackController } from './SnackController';
 import { CoreHelperUtil } from '../utils/CoreHelperUtil';
 import { EventsController } from './EventsController';
-import { NetworkController } from './NetworkController';
 import { RouterController } from './RouterController';
+import { ConnectionsController } from './ConnectionsController';
+import { SwapController } from './SwapController';
 
 // -- Types --------------------------------------------- //
 
@@ -42,124 +43,125 @@ export const SendController = {
   setReceiverProfileName(receiverProfileName) {
     state.receiverProfileName = receiverProfileName;
   },
-  setGasPrice(gasPrice) {
-    state.gasPrice = gasPrice;
-  },
-  setGasPriceInUsd(gasPriceInUSD) {
-    state.gasPriceInUSD = gasPriceInUSD;
-  },
   setLoading(loading) {
     state.loading = loading;
   },
-  sendToken() {
-    if (this.state.token?.address && this.state.sendTokenAmount && this.state.receiverAddress) {
-      state.loading = true;
+  async sendToken() {
+    const isAuth = !!ConnectionsController.state.connection?.properties?.provider;
+    const eventProperties = {
+      isSmartAccount: ConnectionsController.state.accountType === 'smartAccount',
+      token: this.state.token?.address ?? this.state.token?.symbol ?? '',
+      amount: this.state.sendTokenAmount || 0,
+      network: ConnectionsController.state.activeNetwork?.caipNetworkId ?? ''
+    };
+    try {
+      this.state.loading = true;
       EventsController.sendEvent({
         type: 'track',
         event: 'SEND_INITIATED',
-        properties: {
-          isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount',
-          token: this.state.token.address,
-          amount: this.state.sendTokenAmount,
-          network: NetworkController.state.caipNetwork?.id || ''
-        }
+        properties: eventProperties
       });
-      this.sendERC20Token({
-        receiverAddress: this.state.receiverAddress,
-        tokenAddress: this.state.token.address,
-        sendTokenAmount: this.state.sendTokenAmount,
-        decimals: this.state.token.quantity.decimals
+      switch (ConnectionsController.state.activeNamespace) {
+        case 'eip155':
+          await SendController.sendEvmToken();
+          break;
+        case 'solana':
+          await SendController.sendSolanaToken();
+          break;
+        default:
+          throw new Error('Unsupported chain');
+      }
+      SnackController.showSuccess('Transaction started');
+      EventsController.sendEvent({
+        type: 'track',
+        event: 'SEND_SUCCESS',
+        properties: eventProperties
       });
-    } else if (this.state.receiverAddress && this.state.sendTokenAmount && this.state.gasPrice && this.state.token?.quantity.decimals) {
-      state.loading = true;
+      RouterController.reset(isAuth ? 'Account' : 'AccountDefault');
+      this.resetState();
+    } catch (error) {
       EventsController.sendEvent({
         type: 'track',
-        event: 'SEND_INITIATED',
-        properties: {
-          isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount',
-          token: this.state.token?.symbol,
-          amount: this.state.sendTokenAmount,
-          network: NetworkController.state.caipNetwork?.id || ''
-        }
+        event: 'SEND_ERROR',
+        properties: eventProperties
       });
-      this.sendNativeToken({
+      SnackController.showError('Something went wrong');
+    } finally {
+      this.state.loading = false;
+    }
+  },
+  async sendEvmToken() {
+    if (this.state.token?.address && this.state.sendTokenAmount && this.state.receiverAddress) {
+      await this.sendERC20Token({
+        receiverAddress: this.state.receiverAddress,
+        tokenAddress: this.state.token.address,
+        sendTokenAmount: this.state.sendTokenAmount,
+        decimals: this.state.token.quantity?.decimals || '0'
+      });
+    } else if (this.state.receiverAddress && this.state.sendTokenAmount && this.state.token?.quantity?.decimals) {
+      await this.sendNativeToken({
         receiverAddress: this.state.receiverAddress,
         sendTokenAmount: this.state.sendTokenAmount,
-        gasPrice: this.state.gasPrice,
         decimals: this.state.token.quantity.decimals
       });
     }
   },
   async sendNativeToken(params) {
-    RouterController.pushTransactionStack({
-      view: 'Account',
-      goBack: false
-    });
     const to = params.receiverAddress;
-    const address = AccountController.state.address;
-    const value = ConnectionController.parseUnits(params.sendTokenAmount.toString(), Number(params.decimals));
-    const data = '0x';
-    try {
-      await ConnectionController.sendTransaction({
-        to,
-        address,
-        data,
-        value,
-        gasPrice: params.gasPrice
-      });
-      SnackController.showSuccess('Transaction started');
-      EventsController.sendEvent({
-        type: 'track',
-        event: 'SEND_SUCCESS',
-        properties: {
-          isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount',
-          token: this.state.token?.symbol || '',
-          amount: params.sendTokenAmount,
-          network: NetworkController.state.caipNetwork?.id || ''
-        }
-      });
-      this.resetSend();
-    } catch (error) {
-      state.loading = false;
-      EventsController.sendEvent({
-        type: 'track',
-        event: 'SEND_ERROR',
-        properties: {
-          isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount',
-          token: this.state.token?.symbol || '',
-          amount: params.sendTokenAmount,
-          network: NetworkController.state.caipNetwork?.id || ''
-        }
-      });
-      SnackController.showError('Something went wrong');
+    const network = ConnectionsController.state.activeNetwork;
+    const address = CoreHelperUtil.getPlainAddress(ConnectionsController.state.activeAddress);
+    if (!address) {
+      throw new Error('Invalid address');
     }
+    const value = ConnectionsController.parseUnits(params.sendTokenAmount.toString(), Number(params.decimals));
+    const data = '0x';
+    await ConnectionsController.sendTransaction({
+      to,
+      address,
+      data,
+      value,
+      network
+    });
   },
   async sendERC20Token(params) {
-    RouterController.pushTransactionStack({
-      view: 'Account',
-      goBack: false
-    });
-    const amount = ConnectionController.parseUnits(params.sendTokenAmount.toString(), Number(params.decimals));
-    try {
-      if (AccountController.state.address && params.sendTokenAmount && params.receiverAddress && params.tokenAddress) {
-        const tokenAddress = CoreHelperUtil.getPlainAddress(params.tokenAddress);
-        await ConnectionController.writeContract({
-          fromAddress: AccountController.state.address,
-          tokenAddress,
-          receiverAddress: params.receiverAddress,
-          tokenAmount: amount,
-          method: 'transfer',
-          abi: ContractUtil.getERC20Abi(tokenAddress)
-        });
-        SnackController.showSuccess('Transaction started');
-        this.resetSend();
+    const network = ConnectionsController.state.activeNetwork;
+    const amount = ConnectionsController.parseUnits(params.sendTokenAmount.toString(), Number(params.decimals));
+    if (ConnectionsController.state.activeAddress && params.sendTokenAmount && params.receiverAddress && params.tokenAddress) {
+      const tokenAddress = CoreHelperUtil.getPlainAddress(params.tokenAddress);
+      const fromAddress = CoreHelperUtil.getPlainAddress(ConnectionsController.state.activeAddress);
+      if (!fromAddress) {
+        throw new Error('Invalid address');
       }
-    } catch (error) {
-      state.loading = false;
-      SnackController.showError('Something went wrong');
+      await ConnectionsController.writeContract({
+        fromAddress,
+        tokenAddress,
+        receiverAddress: params.receiverAddress,
+        tokenAmount: amount,
+        method: 'transfer',
+        abi: ContractUtil.getERC20Abi(tokenAddress),
+        network
+      });
+    }
+  },
+  async sendSolanaToken() {
+    if (!this.state.sendTokenAmount || !this.state.receiverAddress) {
+      throw new Error('An amount and receiver address are required');
     }
+    const plainAddress = CoreHelperUtil.getPlainAddress(ConnectionsController.state.activeAddress);
+    if (!plainAddress) {
+      throw new Error('Invalid address');
+    }
+    await ConnectionsController.sendTransaction({
+      fromAddress: plainAddress,
+      toAddress: this.state.receiverAddress,
+      amount: this.state.sendTokenAmount,
+      network: ConnectionsController.state.activeNetwork
+    });
+  },
+  async fetchNetworkPrice() {
+    await SwapController.getNetworkTokenPrice();
   },
-  resetSend() {
+  resetState() {
     state.token = undefined;
     state.sendTokenAmount = undefined;
     state.receiverAddress = undefined;

package/lib/module/controllers/SendController.js.map

@@ -1 +1 @@
-{"version":3,"names":["subscribeKey","subKey","proxy","ref","subscribe","sub","ContractUtil","AccountController","ConnectionController","SnackController","CoreHelperUtil","EventsController","NetworkController","RouterController","state","loading","SendController","callback","key","setToken","token","setTokenAmount","sendTokenAmount","setReceiverAddress","receiverAddress","setReceiverProfileImageUrl","receiverProfileImageUrl","setReceiverProfileName","receiverProfileName","setGasPrice","gasPrice","setGasPriceInUsd","gasPriceInUSD","setLoading","sendToken","address","sendEvent","type","event","properties","isSmartAccount","preferredAccountType","amount","network","caipNetwork","id","sendERC20Token","tokenAddress","decimals","quantity","symbol","sendNativeToken","params","pushTransactionStack","view","goBack","to","value","parseUnits","toString","Number","data","sendTransaction","showSuccess","resetSend","error","showError","getPlainAddress","writeContract","fromAddress","tokenAmount","method","abi","getERC20Abi","undefined"],"sourceRoot":"../../../src","sources":["controllers/SendController.ts"],"mappings":"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"}
+{"version":3,"names":["subscribeKey","subKey","proxy","ref","subscribe","sub","ContractUtil","SnackController","CoreHelperUtil","EventsController","RouterController","ConnectionsController","SwapController","state","loading","SendController","callback","key","setToken","token","setTokenAmount","sendTokenAmount","setReceiverAddress","receiverAddress","setReceiverProfileImageUrl","receiverProfileImageUrl","setReceiverProfileName","receiverProfileName","setLoading","sendToken","isAuth","connection","properties","provider","eventProperties","isSmartAccount","accountType","address","symbol","amount","network","activeNetwork","caipNetworkId","sendEvent","type","event","activeNamespace","sendEvmToken","sendSolanaToken","Error","showSuccess","reset","resetState","error","showError","sendERC20Token","tokenAddress","decimals","quantity","sendNativeToken","params","to","getPlainAddress","activeAddress","value","parseUnits","toString","Number","data","sendTransaction","fromAddress","writeContract","tokenAmount","method","abi","getERC20Abi","plainAddress","toAddress","fetchNetworkPrice","getNetworkTokenPrice","undefined"],"sourceRoot":"../../../src","sources":["controllers/SendController.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/controllers/SnackController.js

@@ -1,3 +1,5 @@
+"use strict";
+
 import { proxy } from 'valtio';
 import { OptionsController } from './OptionsController';
 
@@ -11,23 +13,47 @@ const state = proxy({
   long: false
 });
 
+// -- Private Variables --------------------------------- //
+let hideTimeout = null;
+
+// -- Private Functions --------------------------------- //
+const clearHideTimeout = () => {
+  if (hideTimeout) {
+    clearTimeout(hideTimeout);
+    hideTimeout = null;
+  }
+};
+const scheduleAutoHide = long => {
+  clearHideTimeout();
+  const duration = long ? 15000 : 2200;
+  hideTimeout = setTimeout(() => {
+    SnackController.hide();
+  }, duration);
+};
+
 // -- Controller ---------------------------------------- //
 export const SnackController = {
   state,
-  showSuccess(message) {
+  showSuccess(message, long = false) {
     state.message = message;
     state.variant = 'success';
     state.open = true;
+    state.long = long;
+    scheduleAutoHide(long);
   },
-  showError(message) {
+  showError(message, long = false) {
     state.message = message;
     state.variant = 'error';
     state.open = true;
+    state.long = long;
+    scheduleAutoHide(long);
   },
-  showLoading(message) {
+  showLoading(message, long = false) {
     state.message = message;
     state.variant = 'loading';
     state.open = true;
+    state.long = long;
+    scheduleAutoHide(long);
   },
   showInternalError(error) {
     const {
@@ -38,6 +64,7 @@ export const SnackController = {
       state.variant = 'error';
       state.open = true;
       state.long = true;
+      scheduleAutoHide(true);
     }
     if (error.longMessage) {
       // eslint-disable-next-line no-console
@@ -45,10 +72,9 @@ export const SnackController = {
     }
   },
   hide() {
+    clearHideTimeout();
     state.open = false;
     state.long = false;
-    state.message = '';
-    state.variant = 'success';
   }
 };
 //# sourceMappingURL=SnackController.js.map

package/lib/module/controllers/SnackController.js.map

@@ -1 +1 @@
-{"version":3,"names":["proxy","OptionsController","state","message","variant","open","long","SnackController","showSuccess","showError","showLoading","showInternalError","error","debug","shortMessage","longMessage","console","hide"],"sourceRoot":"../../../src","sources":["controllers/SnackController.ts"],"mappings":"AAAA,SAASA,KAAK,QAAQ,QAAQ;AAC9B,SAASC,iBAAiB,QAAQ,qBAAqB;;AAEvD;;AAaA;AACA,MAAMC,KAAK,GAAGF,KAAK,CAAuB;EACxCG,OAAO,EAAE,EAAE;EACXC,OAAO,EAAE,SAAS;EAClBC,IAAI,EAAE,KAAK;EACXC,IAAI,EAAE;AACR,CAAC,CAAC;;AAEF;AACA,OAAO,MAAMC,eAAe,GAAG;EAC7BL,KAAK;EAELM,WAAWA,CAACL,OAAwC,EAAE;IACpDD,KAAK,CAACC,OAAO,GAAGA,OAAO;IACvBD,KAAK,CAACE,OAAO,GAAG,SAAS;IACzBF,KAAK,CAACG,IAAI,GAAG,IAAI;EACnB,CAAC;EAEDI,SAASA,CAACN,OAAwC,EAAE;IAClDD,KAAK,CAACC,OAAO,GAAGA,OAAO;IACvBD,KAAK,CAACE,OAAO,GAAG,OAAO;IACvBF,KAAK,CAACG,IAAI,GAAG,IAAI;EACnB,CAAC;EAEDK,WAAWA,CAACP,OAAwC,EAAE;IACpDD,KAAK,CAACC,OAAO,GAAGA,OAAO;IACvBD,KAAK,CAACE,OAAO,GAAG,SAAS;IACzBF,KAAK,CAACG,IAAI,GAAG,IAAI;EACnB,CAAC;EAEDM,iBAAiBA,CAACC,KAAc,EAAE;IAChC,MAAM;MAAEC;IAAM,CAAC,GAAGZ,iBAAiB,CAACC,KAAK;IAEzC,IAAIW,KAAK,EAAE;MACTX,KAAK,CAACC,OAAO,GAAGS,KAAK,CAACE,YAAY;MAClCZ,KAAK,CAACE,OAAO,GAAG,OAAO;MACvBF,KAAK,CAACG,IAAI,GAAG,IAAI;MACjBH,KAAK,CAACI,IAAI,GAAG,IAAI;IACnB;IAEA,IAAIM,KAAK,CAACG,WAAW,EAAE;MACrB;MACAC,OAAO,CAACJ,KAAK,CAACA,KAAK,CAACG,WAAW,CAAC;IAClC;EACF,CAAC;EAEDE,IAAIA,CAAA,EAAG;IACLf,KAAK,CAACG,IAAI,GAAG,KAAK;IAClBH,KAAK,CAACI,IAAI,GAAG,KAAK;IAClBJ,KAAK,CAACC,OAAO,GAAG,EAAE;IAClBD,KAAK,CAACE,OAAO,GAAG,SAAS;EAC3B;AACF,CAAC"}
+{"version":3,"names":["proxy","OptionsController","state","message","variant","open","long","hideTimeout","clearHideTimeout","clearTimeout","scheduleAutoHide","duration","setTimeout","SnackController","hide","showSuccess","showError","showLoading","showInternalError","error","debug","shortMessage","longMessage","console"],"sourceRoot":"../../../src","sources":["controllers/SnackController.ts"],"mappings":";;AAAA,SAASA,KAAK,QAAQ,QAAQ;AAC9B,SAASC,iBAAiB,QAAQ,qBAAqB;;AAEvD;;AAaA;AACA,MAAMC,KAAK,GAAGF,KAAK,CAAuB;EACxCG,OAAO,EAAE,EAAE;EACXC,OAAO,EAAE,SAAS;EAClBC,IAAI,EAAE,KAAK;EACXC,IAAI,EAAE;AACR,CAAC,CAAC;;AAEF;AACA,IAAIC,WAAkC,GAAG,IAAI;;AAE7C;AACA,MAAMC,gBAAgB,GAAGA,CAAA,KAAM;EAC7B,IAAID,WAAW,EAAE;IACfE,YAAY,CAACF,WAAW,CAAC;IACzBA,WAAW,GAAG,IAAI;EACpB;AACF,CAAC;AAED,MAAMG,gBAAgB,GAAIJ,IAAa,IAAK;EAC1CE,gBAAgB,CAAC,CAAC;EAElB,MAAMG,QAAQ,GAAGL,IAAI,GAAG,KAAK,GAAG,IAAI;EACpCC,WAAW,GAAGK,UAAU,CAAC,MAAM;IAC7BC,eAAe,CAACC,IAAI,CAAC,CAAC;EACxB,CAAC,EAAEH,QAAQ,CAAC;AACd,CAAC;;AAED;AACA,OAAO,MAAME,eAAe,GAAG;EAC7BX,KAAK;EAELa,WAAWA,CAACZ,OAAwC,EAAEG,IAAI,GAAG,KAAK,EAAE;IAClEJ,KAAK,CAACC,OAAO,GAAGA,OAAO;IACvBD,KAAK,CAACE,OAAO,GAAG,SAAS;IACzBF,KAAK,CAACG,IAAI,GAAG,IAAI;IACjBH,KAAK,CAACI,IAAI,GAAGA,IAAI;IACjBI,gBAAgB,CAACJ,IAAI,CAAC;EACxB,CAAC;EAEDU,SAASA,CAACb,OAAwC,EAAEG,IAAI,GAAG,KAAK,EAAE;IAChEJ,KAAK,CAACC,OAAO,GAAGA,OAAO;IACvBD,KAAK,CAACE,OAAO,GAAG,OAAO;IACvBF,KAAK,CAACG,IAAI,GAAG,IAAI;IACjBH,KAAK,CAACI,IAAI,GAAGA,IAAI;IACjBI,gBAAgB,CAACJ,IAAI,CAAC;EACxB,CAAC;EAEDW,WAAWA,CAACd,OAAwC,EAAEG,IAAI,GAAG,KAAK,EAAE;IAClEJ,KAAK,CAACC,OAAO,GAAGA,OAAO;IACvBD,KAAK,CAACE,OAAO,GAAG,SAAS;IACzBF,KAAK,CAACG,IAAI,GAAG,IAAI;IACjBH,KAAK,CAACI,IAAI,GAAGA,IAAI;IACjBI,gBAAgB,CAACJ,IAAI,CAAC;EACxB,CAAC;EAEDY,iBAAiBA,CAACC,KAAc,EAAE;IAChC,MAAM;MAAEC;IAAM,CAAC,GAAGnB,iBAAiB,CAACC,KAAK;IAEzC,IAAIkB,KAAK,EAAE;MACTlB,KAAK,CAACC,OAAO,GAAGgB,KAAK,CAACE,YAAY;MAClCnB,KAAK,CAACE,OAAO,GAAG,OAAO;MACvBF,KAAK,CAACG,IAAI,GAAG,IAAI;MACjBH,KAAK,CAACI,IAAI,GAAG,IAAI;MACjBI,gBAAgB,CAAC,IAAI,CAAC;IACxB;IAEA,IAAIS,KAAK,CAACG,WAAW,EAAE;MACrB;MACAC,OAAO,CAACJ,KAAK,CAACA,KAAK,CAACG,WAAW,CAAC;IAClC;EACF,CAAC;EAEDR,IAAIA,CAAA,EAAG;IACLN,gBAAgB,CAAC,CAAC;IAClBN,KAAK,CAACG,IAAI,GAAG,KAAK;IAClBH,KAAK,CAACI,IAAI,GAAG,KAAK;EACpB;AACF,CAAC","ignoreList":[]}