@kimafinance/kima-transaction-widget 1.1.13 → 1.1.14

package/dist/index.js

@@ -5,7 +5,7 @@ var React__default = _interopDefault(React);
 var toolkit = require('@reduxjs/toolkit');
 var web3_js = require('@solana/web3.js');
 var reactRedux = require('react-redux');
-var walletAdapterReact = require('@solana/wallet-adapter-react');
+var SolanaAdapter = require('@solana/wallet-adapter-react');
 var walletAdapterWallets = require('@solana/wallet-adapter-wallets');
 var detectEthereumProvider = _interopDefault(require('@metamask/detect-provider'));
 var ethers = require('ethers');
@@ -812,13 +812,17 @@ var TransactionStatus;
   CurrencyOptions["USDK"] = "USDK";
   CurrencyOptions["G$"] = "GDOLLAR";
 })(exports.CurrencyOptions || (exports.CurrencyOptions = {}));
-(function (ThemeOptions) {
-  ThemeOptions["light"] = "light";
-  ThemeOptions["dark"] = "dark";
-})(exports.ThemeOptions || (exports.ThemeOptions = {}));
+(function (ColorModeOptions) {
+  ColorModeOptions["light"] = "light";
+  ColorModeOptions["dark"] = "dark";
+})(exports.ColorModeOptions || (exports.ColorModeOptions = {}));
+(function (DAppOptions) {
+  DAppOptions["G$"] = "G$";
+  DAppOptions["None"] = "none";
+})(exports.DAppOptions || (exports.DAppOptions = {}));
 
 var initialState = {
-  theme: exports.ThemeOptions.light,
+  theme: {},
   mode: exports.ModeOptions.bridge,
   originNetwork: '',
   targetNetwork: '',
@@ -827,6 +831,9 @@ var initialState = {
   helpPopup: false,
   hashPopup: false,
   bankPopup: false,
+  walletAutoConnect: false,
+  provider: undefined,
+  dAppOption: exports.DAppOptions.None,
   solanaProvider: undefined,
   submitted: false,
   amount: 0,
@@ -894,6 +901,15 @@ var optionSlice = toolkit.createSlice({
     setBankPopup: function setBankPopup(state, action) {
       state.bankPopup = action.payload;
     },
+    setProvider: function setProvider(state, action) {
+      state.provider = action.payload;
+    },
+    setDappOption: function setDappOption(state, action) {
+      state.dAppOption = action.payload;
+    },
+    setWalletAutoConnect: function setWalletAutoConnect(state, action) {
+      state.walletAutoConnect = action.payload;
+    },
     setSolanaProvider: function setSolanaProvider(state, action) {
       state.solanaProvider = action.payload;
     },
@@ -970,6 +986,9 @@ var _optionSlice$actions = optionSlice.actions,
   setHashPopup = _optionSlice$actions.setHashPopup,
   setBankPopup = _optionSlice$actions.setBankPopup,
   setSolanaProvider = _optionSlice$actions.setSolanaProvider,
+  setProvider = _optionSlice$actions.setProvider,
+  setDappOption = _optionSlice$actions.setDappOption,
+  setWalletAutoConnect = _optionSlice$actions.setWalletAutoConnect,
   setSubmitted = _optionSlice$actions.setSubmitted,
   setTransactionOption = _optionSlice$actions.setTransactionOption,
   setAmount = _optionSlice$actions.setAmount,
@@ -1029,6 +1048,15 @@ var selectBankPopup = function selectBankPopup(state) {
 var selectSolanaProvider = function selectSolanaProvider(state) {
   return state.option.solanaProvider;
 };
+var selectProvider = function selectProvider(state) {
+  return state.option.provider;
+};
+var selectDappOption = function selectDappOption(state) {
+  return state.option.dAppOption;
+};
+var selectWalletAutoConnect = function selectWalletAutoConnect(state) {
+  return state.option.walletAutoConnect;
+};
 var selectSubmitted = function selectSubmitted(state) {
   return state.option.submitted;
 };
@@ -1117,62 +1145,75 @@ var EthereumProvider = function EthereumProvider(_ref) {
   var _useState5 = React.useState(undefined),
     signerAddress = _useState5[0],
     setSignerAddress = _useState5[1];
+  var dispatch = reactRedux.useDispatch();
+  var ethereumProvider = reactRedux.useSelector(selectProvider);
+  React.useEffect(function () {
+    if (!ethereumProvider || !chainId) return;
+    dispatch(setOriginNetwork(CHAIN_IDS_TO_NAMES[chainId]));
+  }, [ethereumProvider, chainId]);
   var connect = React.useCallback(function () {
     setProviderError(null);
-    detectEthereumProvider().then(function (detectedProvider) {
-      if (detectedProvider) {
-        var _provider = new ethers.ethers.providers.Web3Provider(detectedProvider, 'any');
-        _provider.send('eth_requestAccounts', []).then(function () {
-          setProviderError(null);
-          setProvider(_provider);
-          _provider.getNetwork().then(function (network) {
-            setChainId(network.chainId);
-          })["catch"](function (e) {
-            errorHandler(e);
-            setProviderError('An error occurred while getting the network');
-          });
-          var signer = _provider.getSigner();
-          setSigner(signer);
-          signer.getAddress().then(function (address) {
-            setSignerAddress(address);
-          })["catch"](function (e) {
-            errorHandler(e);
-            setProviderError('An error occurred while getting the signer address');
-          });
-          if (detectedProvider && detectedProvider.on) {
-            detectedProvider.on('chainChanged', function (chainId) {
-              try {
-                setChainId(ethers.BigNumber.from(chainId).toNumber());
-              } catch (e) {
-                errorHandler(e);
-              }
-            });
-            detectedProvider.on('accountsChanged', function (accounts) {
-              try {
-                var _signer = _provider.getSigner();
-                setSigner(_signer);
-                _signer.getAddress().then(function (address) {
-                  setSignerAddress(address);
-                })["catch"](function (e) {
-                  errorHandler(e);
-                  setProviderError('An error occurred while getting the signer address');
-                });
-              } catch (e) {
-                errorHandler(e);
-              }
-            });
-          }
+    var handleProvider = function handleProvider(provider) {
+      provider.send('eth_requestAccounts', []).then(function () {
+        setProviderError(null);
+        setProvider(provider);
+        provider.getNetwork().then(function (network) {
+          setChainId(network.chainId);
         })["catch"](function (e) {
           errorHandler(e);
-          setProviderError('An error occurred while requesting eth accounts');
+          setProviderError('An error occurred while getting the network');
         });
-      } else {
+        var signer = provider.getSigner();
+        setSigner(signer);
+        signer.getAddress().then(function (address) {
+          setSignerAddress(address);
+        })["catch"](function (e) {
+          errorHandler(e);
+          setProviderError('An error occurred while getting the signer address');
+        });
+        if (detectedProvider && detectedProvider.on) {
+          detectedProvider.on('chainChanged', function (chainId) {
+            try {
+              setChainId(ethers.BigNumber.from(chainId).toNumber());
+            } catch (e) {
+              errorHandler(e);
+            }
+          });
+          detectedProvider.on('accountsChanged', function (accounts) {
+            try {
+              var _signer = provider.getSigner();
+              setSigner(_signer);
+              _signer.getAddress().then(function (address) {
+                setSignerAddress(address);
+              })["catch"](function (e) {
+                errorHandler(e);
+                setProviderError('An error occurred while getting the signer address');
+              });
+            } catch (e) {
+              errorHandler(e);
+            }
+          });
+        }
+      })["catch"](function (e) {
+        errorHandler(e);
+        setProviderError('An error occurred while requesting eth accounts');
+      });
+    };
+    if (ethereumProvider) {
+      handleProvider(ethereumProvider);
+    } else {
+      detectEthereumProvider().then(function (detectedProvider) {
+        if (detectedProvider) {
+          var _provider = new ethers.ethers.providers.Web3Provider(detectedProvider, 'any');
+          handleProvider(_provider);
+        } else {
+          setProviderError('Please install MetaMask');
+        }
+      })["catch"](function (e) {
+        errorHandler(e);
         setProviderError('Please install MetaMask');
-      }
-    })["catch"](function (e) {
-      errorHandler(e);
-      setProviderError('Please install MetaMask');
-    });
+      });
+    }
   }, []);
   var disconnect = React.useCallback(function () {
     setProviderError(null);
@@ -1277,7 +1318,7 @@ var Progressbar = function Progressbar(_ref) {
     }, React__default.createElement("div", {
       className: 'step-info'
     }, index === loadingStep ? React__default.createElement(Loading180Ring, {
-      fill: theme === exports.ThemeOptions.dark ? 'white' : '#5aa0db'
+      fill: theme.colorMode === 'dark' ? 'white' : '#5aa0db'
     }) : step >= index ? index === errorStep ? React__default.createElement(Warning, null) : React__default.createElement(Check, null) : null, React__default.createElement("span", null, item.title)));
   })));
 };
@@ -1309,7 +1350,7 @@ var NetworkLabel = function NetworkLabel(_ref) {
   }, React__default.createElement("div", {
     className: 'icon-wrapper'
   }, SourceInfo && React__default.createElement(SourceInfo.icon, null)), SourceInfo === null || SourceInfo === void 0 ? void 0 : SourceInfo.label), React__default.createElement(ArrowRight, {
-    fill: theme === 'light' ? 'black' : 'white'
+    fill: theme.colorMode === 'light' ? 'black' : 'white'
   }), React__default.createElement("div", {
     className: 'label'
   }, React__default.createElement("div", {
@@ -1399,28 +1440,35 @@ function useNetworkOptions() {
   var _useState = React.useState(networkOptions),
     options = _useState[0],
     setOptions = _useState[1];
+  var dAppOption = reactRedux.useSelector(selectDappOption);
   var nodeProviderQuery = reactRedux.useSelector(selectNodeProviderQuery);
   React.useEffect(function () {
     if (!nodeProviderQuery) return;
-    (function () {
-      try {
-        var _temp2 = _catch(function () {
-          return Promise.resolve(fetchWrapper.get(nodeProviderQuery + "/kima-finance/kima/kima/getChains")).then(function (networks) {
-            setOptions(networkOptions.filter(function (network) {
-              return networks.Chains.findIndex(function (id) {
-                return id === network.id;
-              }) >= 0;
-            }));
+    if (dAppOption === exports.DAppOptions.None) {
+      (function () {
+        try {
+          var _temp = _catch(function () {
+            return Promise.resolve(fetchWrapper.get(nodeProviderQuery + "/kima-finance/kima/kima/getChains")).then(function (networks) {
+              setOptions(networkOptions.filter(function (network) {
+                return networks.Chains.findIndex(function (id) {
+                  return id === network.id;
+                }) >= 0;
+              }));
+            });
+          }, function (e) {
+            console.log('rpc disconnected', e);
           });
-        }, function (e) {
-          console.log('rpc disconnected', e);
-        });
-        return _temp2 && _temp2.then ? _temp2.then(function () {}) : void 0;
-      } catch (e) {
-        Promise.reject(e);
-      }
-    })();
-  }, [nodeProviderQuery]);
+          return _temp && _temp.then ? _temp.then(function () {}) : void 0;
+        } catch (e) {
+          Promise.reject(e);
+        }
+      })();
+    } else {
+      setOptions(networkOptions.filter(function (network) {
+        return network.label === 'Fuse' || network.label === 'Celo';
+      }));
+    }
+  }, [nodeProviderQuery, dAppOption]);
   return React.useMemo(function () {
     return {
       options: options
@@ -1464,7 +1512,7 @@ var Network = function Network(_ref) {
     if (!nodeProviderQuery || mode !== exports.ModeOptions.bridge) return;
     (function () {
       try {
-        var _temp2 = _catch(function () {
+        var _temp = _catch(function () {
           return Promise.resolve(fetchWrapper.get(nodeProviderQuery + "/kima-finance/kima/kima/get_available_chains/" + originNetwork)).then(function (networks) {
             setAvailableNetworks(networks.Chains);
             if (isOriginChain) {
@@ -1474,7 +1522,7 @@ var Network = function Network(_ref) {
         }, function (e) {
           console.log('rpc disconnected', e);
         });
-        return _temp2 && _temp2.then ? _temp2.then(function () {}) : void 0;
+        return _temp && _temp.then ? _temp.then(function () {}) : void 0;
       } catch (e) {
         Promise.reject(e);
       }
@@ -1484,14 +1532,14 @@ var Network = function Network(_ref) {
     if (!nodeProviderQuery || mode !== exports.ModeOptions.payment) return;
     (function () {
       try {
-        var _temp4 = _catch(function () {
+        var _temp2 = _catch(function () {
           return Promise.resolve(fetchWrapper.get(nodeProviderQuery + "/kima-finance/kima/kima/get_available_chains/" + targetNetwork)).then(function (networks) {
             setAvailableNetworks(networks.Chains);
           });
         }, function (e) {
           console.log('rpc disconnected', e);
         });
-        return _temp4 && _temp4.then ? _temp4.then(function () {}) : void 0;
+        return _temp2 && _temp2.then ? _temp2.then(function () {}) : void 0;
       } catch (e) {
         Promise.reject(e);
       }
@@ -1544,10 +1592,10 @@ var Network = function Network(_ref) {
   }, React__default.createElement("p", null, isOriginChain ? 'Which network are you funding from?' : 'Which network are you funding to?'), React__default.createElement("div", {
     className: 'scroll-button'
   }, React__default.createElement(Arrow, {
-    fill: theme === 'light' ? 'black' : 'white',
+    fill: theme.colorMode === 'light' ? 'black' : 'white',
     onClick: slideLeft
   }), React__default.createElement(Arrow, {
-    fill: theme === 'light' ? 'black' : 'white',
+    fill: theme.colorMode === 'light' ? 'black' : 'white',
     onClick: slideRight
   })), React__default.createElement("div", {
     className: 'slide-area hide-scrollbar',
@@ -1556,7 +1604,7 @@ var Network = function Network(_ref) {
     className: 'network-container'
   }, networks.map(function (network) {
     return React__default.createElement("div", {
-      className: "card-item " + theme + " " + (network.id === selectedNetwork.id ? 'active' : ''),
+      className: "card-item " + theme.colorMode + " " + (network.id === selectedNetwork.id ? 'active' : ''),
       key: network.id,
       onClick: function onClick() {
         if (isOriginChain) {
@@ -1575,7 +1623,7 @@ var WalletSelect = function WalletSelect() {
   var selectedProvider = reactRedux.useSelector(selectSolanaProvider);
   var sliderRef = React.useRef();
   var dispatch = reactRedux.useDispatch();
-  var _useWallet = walletAdapterReact.useWallet(),
+  var _useWallet = SolanaAdapter.useWallet(),
     wallets = _useWallet.wallets;
   var _useMemo = React.useMemo(function () {
       var detected = [];
@@ -1639,10 +1687,10 @@ var WalletSelect = function WalletSelect() {
   }, React__default.createElement("p", null, "Please select:"), React__default.createElement("div", {
     className: 'scroll-button'
   }, React__default.createElement(Arrow, {
-    fill: theme === 'light' ? 'black' : 'white',
+    fill: theme.colorMode === 'light' ? 'black' : 'white',
     onClick: slideLeft
   }), React__default.createElement(Arrow, {
-    fill: theme === 'light' ? 'black' : 'white',
+    fill: theme.colorMode === 'light' ? 'black' : 'white',
     onClick: slideRight
   })), React__default.createElement("div", {
     className: 'slide-area hide-scrollbar',
@@ -1651,7 +1699,7 @@ var WalletSelect = function WalletSelect() {
     className: 'wallet-container'
   }, detected.map(function (wallet) {
     return React__default.createElement("div", {
-      className: "card-item " + theme + " " + (wallet.adapter.name === selectedProvider ? 'active' : ''),
+      className: "card-item " + theme.colorMode + " " + (wallet.adapter.name === selectedProvider ? 'active' : ''),
       onClick: function onClick() {
         return dispatch(setSolanaProvider(wallet.adapter.name));
       },
@@ -1663,7 +1711,7 @@ var WalletSelect = function WalletSelect() {
   }), undetected.map(function (wallet) {
     return React__default.createElement(ExternalLink, {
       to: wallet.adapter.url,
-      className: "card-item " + theme,
+      className: "card-item " + theme.colorMode,
       key: wallet.adapter.name
     }, React__default.createElement("img", {
       src: wallet.adapter.icon,
@@ -1673,7 +1721,6 @@ var WalletSelect = function WalletSelect() {
 };
 
 const version = "logger/5.7.0";
-//# sourceMappingURL=_version.js.map
 
 let _permanentCensorErrors = false;
 let _censorErrors = false;
@@ -2023,10 +2070,8 @@ class Logger {
 }
 Logger.errors = ErrorCode;
 Logger.levels = LogLevel;
-//# sourceMappingURL=index.js.map
 
 const version$1 = "bytes/5.7.0";
-//# sourceMappingURL=_version.js.map
 
 const logger = new Logger(version$1);
 ///////////////////////////////
@@ -2137,7 +2182,6 @@ function hexStripZeros(value) {
     }
     return "0x" + value.substring(offset);
 }
-//# sourceMappingURL=index.js.map
 
 var createWalletStatus = function createWalletStatus(isReady, statusMessage, forceNetworkSwitch, walletAddress) {
   if (statusMessage === void 0) {
@@ -2155,7 +2199,7 @@ function useIsWalletReady(enableNetworkAutoswitch) {
     enableNetworkAutoswitch = false;
   }
   var autoSwitch = enableNetworkAutoswitch;
-  var _useWallet = walletAdapterReact.useWallet(),
+  var _useWallet = SolanaAdapter.useWallet(),
     solPK = _useWallet.publicKey;
   var _useEthereumProvider = useEthereumProvider(),
     provider = _useEthereumProvider.provider,
@@ -2215,12 +2259,13 @@ var WalletButton = function WalletButton(_ref) {
   var sourceCompliant = reactRedux.useSelector(selectSourceCompliant);
   var compliantOption = reactRedux.useSelector(selectCompliantOption);
   var selectedNetwork = reactRedux.useSelector(selectOriginNetwork);
-  var _useWallet = walletAdapterReact.useWallet(),
+  var walletAutoConnect = reactRedux.useSelector(selectWalletAutoConnect);
+  var _useWallet = SolanaAdapter.useWallet(),
     disconnectSolana = _useWallet.disconnect;
   var _useEthereumProvider = useEthereumProvider(),
     connect = _useEthereumProvider.connect,
     disconnectEVM = _useEthereumProvider.disconnect;
-  var _useIsWalletReady = useIsWalletReady(true),
+  var _useIsWalletReady = useIsWalletReady(walletAutoConnect),
     isReady = _useIsWalletReady.isReady,
     statusMessage = _useIsWalletReady.statusMessage,
     walletAddress = _useIsWalletReady.walletAddress;
@@ -2244,7 +2289,7 @@ var WalletButton = function WalletButton(_ref) {
     connect();
   };
   return React__default.createElement("div", {
-    className: "wallet-button " + theme + " " + (errorBelow ? 'error-below' : ''),
+    className: "wallet-button " + theme.colorMode + " " + (errorBelow ? 'error-below' : ''),
     "data-testid": connectWalletBtn
   }, React__default.createElement(PrimaryButton, {
     clickHandler: handleClick
@@ -2262,7 +2307,7 @@ var CoinDropdown = function CoinDropdown() {
   var selectedCoin = reactRedux.useSelector(selectCurrencyOptions);
   var theme = reactRedux.useSelector(selectTheme);
   return React__default.createElement("div", {
-    className: "coin-dropdown " + theme + " " + (collapsed ? 'collapsed' : ''),
+    className: "coin-dropdown " + theme.colorMode + " " + (collapsed ? 'collapsed' : ''),
     onClick: function onClick() {
       return setCollapsed(function (prev) {
         return !prev;
@@ -2312,7 +2357,7 @@ var NetworkDropdown = function NetworkDropdown(_ref) {
     if (!nodeProviderQuery || mode !== exports.ModeOptions.bridge) return;
     (function () {
       try {
-        var _temp2 = _catch(function () {
+        var _temp = _catch(function () {
           return Promise.resolve(fetchWrapper.get(nodeProviderQuery + "/kima-finance/kima/kima/get_available_chains/" + originNetwork)).then(function (networks) {
             setAvailableNetworks(networks.Chains);
             if (isOriginChain) {
@@ -2322,7 +2367,7 @@ var NetworkDropdown = function NetworkDropdown(_ref) {
         }, function (e) {
           console.log('rpc disconnected', e);
         });
-        return _temp2 && _temp2.then ? _temp2.then(function () {}) : void 0;
+        return _temp && _temp.then ? _temp.then(function () {}) : void 0;
       } catch (e) {
         Promise.reject(e);
       }
@@ -2332,21 +2377,21 @@ var NetworkDropdown = function NetworkDropdown(_ref) {
     if (!nodeProviderQuery || mode !== exports.ModeOptions.payment) return;
     (function () {
       try {
-        var _temp4 = _catch(function () {
+        var _temp2 = _catch(function () {
           return Promise.resolve(fetchWrapper.get(nodeProviderQuery + "/kima-finance/kima/kima/get_available_chains/" + targetNetwork)).then(function (networks) {
             setAvailableNetworks(networks.Chains);
           });
         }, function (e) {
           console.log('rpc disconnected', e);
         });
-        return _temp4 && _temp4.then ? _temp4.then(function () {}) : void 0;
+        return _temp2 && _temp2.then ? _temp2.then(function () {}) : void 0;
       } catch (e) {
         Promise.reject(e);
       }
     })();
   }, [nodeProviderQuery, mode]);
   return React__default.createElement("div", {
-    className: "network-dropdown " + theme + " " + (collapsed ? 'collapsed' : ''),
+    className: "network-dropdown " + theme.colorMode + " " + (collapsed ? 'collapsed' : ''),
     onClick: function onClick() {
       return setCollapsed(function (prev) {
         return !prev;
@@ -2355,7 +2400,7 @@ var NetworkDropdown = function NetworkDropdown(_ref) {
   }, React__default.createElement("div", {
     className: 'network-wrapper'
   }, React__default.createElement(selectedNetwork.icon, null), selectedNetwork.label), React__default.createElement("div", {
-    className: "network-menu custom-scrollbar " + theme + " " + (collapsed ? 'collapsed' : '')
+    className: "network-menu custom-scrollbar " + theme.colorMode + " " + (collapsed ? 'collapsed' : '')
   }, networks.map(function (network) {
     return React__default.createElement("div", {
       className: 'network-menu-item',
@@ -2414,7 +2459,7 @@ var ConfirmDetails = function ConfirmDetails(_ref) {
   }, [networkOptions, originNetwork]);
   var selectedCoin = reactRedux.useSelector(selectCurrencyOptions);
   return React__default.createElement("div", {
-    className: "confirm-details " + theme
+    className: "confirm-details " + theme.colorMode
   }, React__default.createElement("p", null, "Step ", isApproved ? '2' : '1', "\xA0of 2\xA0\xA0\xA0", isApproved ? 'Submit trasaction' : 'Approval'), React__default.createElement("div", {
     className: 'detail-item'
   }, React__default.createElement("span", {
@@ -2497,7 +2542,7 @@ var StepBox = function StepBox(_ref) {
     }, React__default.createElement("div", {
       className: 'info-item'
     }, index === loadingStep ? React__default.createElement(Loading180Ring, {
-      fill: theme === exports.ThemeOptions.dark ? 'white' : '#5aa0db'
+      fill: theme.colorMode === 'dark' ? 'white' : '#5aa0db'
     }) : step >= index ? index === errorStep ? React__default.createElement(Warning, null) : React__default.createElement(Check, null) : null, React__default.createElement("p", null, item.title)), index === 0 && data !== null && data !== void 0 && data.kimaTxHash ? React__default.createElement("div", {
       className: 'info-item'
     }, React__default.createElement("p", null, "Kima TX ID:", ' ', React__default.createElement(ExternalLink, {
@@ -2547,7 +2592,7 @@ var HelpPopup = function HelpPopup() {
       return dispatch(setHelpPopup(false));
     }
   }, React__default.createElement(Cross, {
-    fill: theme === 'light' ? 'black' : 'white'
+    fill: theme.colorMode === 'light' ? 'black' : 'white'
   }))))), React__default.createElement("div", {
     className: 'modal-content'
   }, React__default.createElement("p", null, "The SDK enables dApp developers to process Kima transactions on behalf of their clients. It will include visual and API components that communicate with the Kima RPC nodes. The developers can pick and choose the right level of integration, based on their usage scenario."))));
@@ -2581,7 +2626,7 @@ var HashPopup = function HashPopup(_ref) {
       return dispatch(setHashPopup(false));
     }
   }, React__default.createElement(Cross, {
-    fill: theme === 'light' ? 'black' : 'white'
+    fill: theme.colorMode === 'light' ? 'black' : 'white'
   }))))), React__default.createElement("div", {
     className: 'modal-content'
   }, React__default.createElement("div", {
@@ -2606,7 +2651,7 @@ var WalletConnectModal = function WalletConnectModal() {
   var theme = reactRedux.useSelector(selectTheme);
   var connectModal = reactRedux.useSelector(selectConnectModal);
   var selectedProvider = reactRedux.useSelector(selectSolanaProvider);
-  var _useWallet = walletAdapterReact.useWallet(),
+  var _useWallet = SolanaAdapter.useWallet(),
     select = _useWallet.select,
     connect = _useWallet.connect;
   var handleConnect = function handleConnect() {
@@ -2615,7 +2660,7 @@ var WalletConnectModal = function WalletConnectModal() {
     dispatch(setConnectModal(false));
   };
   return React__default.createElement("div", {
-    className: "kima-modal wallet-connect " + theme + " " + (connectModal ? 'open' : '')
+    className: "kima-modal wallet-connect " + theme.colorMode + " " + (connectModal ? 'open' : '')
   }, React__default.createElement("div", {
     className: 'modal-overlay'
   }), React__default.createElement("div", {
@@ -2634,7 +2679,7 @@ var WalletConnectModal = function WalletConnectModal() {
       return dispatch(setConnectModal(false));
     }
   }, React__default.createElement(Cross, {
-    fill: theme === 'light' ? 'black' : 'white'
+    fill: theme.colorMode === 'light' ? 'black' : 'white'
   }))))), React__default.createElement("div", {
     className: 'modal-content'
   }, React__default.createElement(WalletSelect, null)), React__default.createElement("div", {
@@ -2647,7 +2692,7 @@ var WalletConnectModal = function WalletConnectModal() {
     clickHandler: function clickHandler() {
       return dispatch(setConnectModal(false));
     },
-    theme: theme
+    theme: theme.colorMode
   }, "Cancel"), React__default.createElement(PrimaryButton, {
     clickHandler: handleConnect
   }, "Connect"))));
@@ -2662,7 +2707,7 @@ var HelpPopup$1 = function HelpPopup() {
   var _useState = React.useState(false),
     loading = _useState[0],
     setLoading = _useState[1];
-  var _useState2 = React.useState(""),
+  var _useState2 = React.useState(''),
     memo = _useState2[0],
     setMemo = _useState2[1];
   React.useEffect(function () {
@@ -2701,29 +2746,26 @@ var HelpPopup$1 = function HelpPopup() {
       return dispatch(setBankPopup(false));
     }
   }, React__default.createElement(Cross, {
-    fill: theme === 'light' ? 'black' : 'white'
+    fill: theme.colorMode === 'light' ? 'black' : 'white'
   }))))), React__default.createElement("div", {
     className: 'modal-content'
   }, React__default.createElement("div", {
-    className: "bank-simulation"
+    className: 'bank-simulation'
   }, React__default.createElement("h1", null, "Welcome to the First National Crypto Bank"), React__default.createElement("p", null, "You\u2019re about to send funds to the Kima Finance LTD. bank account"), React__default.createElement("div", {
-    className: "content-item"
+    className: 'content-item'
   }, React__default.createElement("span", null, "User account:"), React__default.createElement("p", null, "2345234525245")), React__default.createElement("div", {
-    className: "content-item"
+    className: 'content-item'
   }, React__default.createElement("span", null, "Sum:"), React__default.createElement("p", null, "$", amount)), React__default.createElement("div", {
-    className: "content-item"
+    className: 'content-item'
   }, React__default.createElement("span", null, "Memo:"), React__default.createElement("p", null, memo)), React__default.createElement(PrimaryButton, {
     clickHandler: onSubmit,
     isLoading: loading,
     disabled: loading
-  }, loading ? "Transferring funds ..." : "Submit")))));
+  }, loading ? 'Transferring funds ...' : 'Submit')))));
 };
 
 var TransactionWidget = function TransactionWidget(_ref) {
-  var _ref$theme = _ref.theme,
-    theme = _ref$theme === void 0 ? exports.ThemeOptions.light : _ref$theme,
-    _ref$fontSize = _ref.fontSize,
-    fontSize = _ref$fontSize === void 0 ? exports.FontSizeOptions.medium : _ref$fontSize;
+  var theme = _ref.theme;
   var _useState = React.useState(0),
     step = _useState[0],
     setStep = _useState[1];
@@ -2783,7 +2825,7 @@ var TransactionWidget = function TransactionWidget(_ref) {
               setPercent(25);
               setErrorStep(1);
               setLoadingStep(-1);
-              console.log(data.failReason);
+              console.error(data.failReason);
             } else if (status === TransactionStatus.KEYSIGNED) {
               setStep(3);
               setPercent(75);
@@ -2797,13 +2839,13 @@ var TransactionWidget = function TransactionWidget(_ref) {
               setPercent(90);
               setErrorStep(3);
               setLoadingStep(-1);
-              console.log(data.failReason);
+              console.error(data.failReason);
             } else if (status === TransactionStatus.FAILEDTOPULL) {
               setStep(1);
               setPercent(25);
               setErrorStep(1);
               setLoadingStep(-1);
-              console.log(data.failReason);
+              console.error(data.failReason);
             } else if (status === TransactionStatus.COMPLETED) {
               setStep(4);
               setPercent(100);
@@ -2830,7 +2872,10 @@ var TransactionWidget = function TransactionWidget(_ref) {
   return React__default.createElement(reactRedux.Provider, {
     store: store
   }, React__default.createElement("div", {
-    className: "kima-card transaction-card " + theme + " font-" + fontSize + " " + (minimized ? 'minimized' : '')
+    className: "kima-card transaction-card " + theme.colorMode + " font-" + theme.fontSize + " " + (minimized ? 'minimized' : ''),
+    style: {
+      fontFamily: theme.fontFamily
+    }
   }, React__default.createElement("div", {
     className: 'kima-card-header'
   }, React__default.createElement("div", {
@@ -2852,7 +2897,7 @@ var TransactionWidget = function TransactionWidget(_ref) {
       setMinimized(true);
     }
   }, React__default.createElement(Minimize, {
-    fill: theme === 'light' ? 'black' : 'white'
+    fill: theme.colorMode === 'light' ? 'black' : 'white'
   })), loadingStep < 0 ? React__default.createElement("button", {
     className: 'icon-button',
     onClick: function onClick() {
@@ -2860,7 +2905,7 @@ var TransactionWidget = function TransactionWidget(_ref) {
       closeHandler();
     }
   }, React__default.createElement(Cross, {
-    fill: theme === 'light' ? 'black' : 'white'
+    fill: theme.colorMode === 'light' ? 'black' : 'white'
   })) : null) : React__default.createElement("div", {
     className: 'control-buttons'
   }, React__default.createElement("div", {
@@ -2888,7 +2933,7 @@ var TransactionWidget = function TransactionWidget(_ref) {
   })), React__default.createElement("div", {
     className: 'kima-card-footer'
   }, React__default.createElement(FooterLogo, {
-    fill: theme === 'light' ? 'black' : '#C5C5C5'
+    fill: theme.colorMode === 'light' ? 'black' : '#C5C5C5'
   })), React__default.createElement(HelpPopup, null), React__default.createElement(HashPopup, {
     data: data
   })));
@@ -2924,13 +2969,13 @@ var SingleForm = function SingleForm(_ref) {
   }, "Target Network:"), React__default.createElement(NetworkDropdown, {
     isOriginChain: false
   })), mode === exports.ModeOptions.bridge && React__default.createElement("div", {
-    className: "form-item " + theme
+    className: "form-item " + theme.colorMode
   }, React__default.createElement("span", {
     className: 'label'
   }, "Target Address:"), React__default.createElement(AddressInput, null), compliantOption && targetCompliant !== 'low' ? React__default.createElement("p", {
     className: 'error'
   }, "Non-compliant address ", "(" + targetCompliant + " risk)") : null), mode === exports.ModeOptions.bridge ? React__default.createElement("div", {
-    className: "form-item " + theme
+    className: "form-item " + theme.colorMode
   }, React__default.createElement("span", {
     className: 'label'
   }, "Amount:"), React__default.createElement("input", {
@@ -2941,11 +2986,11 @@ var SingleForm = function SingleForm(_ref) {
       dispatch(setAmount(parseFloat(_amount.toFixed(2))));
     }
   }), React__default.createElement(CoinDropdown, null)) : React__default.createElement("div", {
-    className: "form-item " + theme
+    className: "form-item " + theme.colorMode
   }, React__default.createElement("span", {
     className: 'label'
   }, "Amount:"), React__default.createElement("div", {
-    className: "amount-label " + theme
+    className: "amount-label " + theme.colorMode
   }, React__default.createElement("span", null, (transactionOption === null || transactionOption === void 0 ? void 0 : transactionOption.amount) || ''), React__default.createElement("div", {
     className: 'coin-wrapper'
   }, React__default.createElement(selectedCoin.icon, null), selectedCoin.symbol))));
@@ -2960,7 +3005,7 @@ var CoinSelect = function CoinSelect() {
   return React__default.createElement("div", {
     className: "coin-select"
   }, React__default.createElement("p", null, "Select Amount of Token for Funding"), React__default.createElement("div", {
-    className: "amount-input " + theme
+    className: "amount-input " + theme.colorMode
   }, React__default.createElement("span", null, "Amount:"), React__default.createElement("div", {
     className: 'input-wrapper'
   }, React__default.createElement("input", {
@@ -3333,12 +3378,12 @@ var getOrCreateAssociatedTokenAccount = function getOrCreateAssociatedTokenAccou
         var err = error;
         return function () {
           if (err.message === 'TokenAccountNotFoundError' || err.message === 'TokenInvalidAccountOwnerError') {
-            var _temp5 = function _temp5() {
+            var _temp2 = function _temp2() {
               return Promise.resolve(getAccountInfo(connection, associatedToken, commitment, programId)).then(function (_getAccountInfo2) {
                 account = _getAccountInfo2;
               });
             };
-            var _temp6 = _catch(function () {
+            var _temp = _catch(function () {
               var transaction = new web3_js.Transaction().add(createAssociatedTokenAccountInstruction(payer, associatedToken, owner, mint, programId, associatedTokenProgramId));
               return Promise.resolve(connection.getRecentBlockhash()).then(function (blockHash) {
                 return Promise.resolve(payer).then(function (_payer) {
@@ -3354,7 +3399,7 @@ var getOrCreateAssociatedTokenAccount = function getOrCreateAssociatedTokenAccou
                 });
               });
             }, function () {});
-            return _temp6 && _temp6.then ? _temp6.then(_temp5) : _temp5(_temp6);
+            return _temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp);
           } else {
             throw error;
           }
@@ -6860,9 +6905,9 @@ function useAllowance() {
   var amount = reactRedux.useSelector(selectAmount);
   var serviceFee = reactRedux.useSelector(selectServiceFee);
   var nodeProviderQuery = reactRedux.useSelector(selectNodeProviderQuery);
-  var _useConnection = walletAdapterReact.useConnection(),
+  var _useConnection = SolanaAdapter.useConnection(),
     connection = _useConnection.connection;
-  var _useSolanaWallet = walletAdapterReact.useWallet(),
+  var _useSolanaWallet = SolanaAdapter.useWallet(),
     publicKey = _useSolanaWallet.publicKey,
     signTransaction = _useSolanaWallet.signTransaction;
   var selectedCoin = reactRedux.useSelector(selectCurrencyOptions);
@@ -6902,10 +6947,10 @@ function useAllowance() {
   React.useEffect(function () {
     (function () {
       try {
-        var _exit2 = false;
+        var _exit = false;
         return _catch(function () {
           function _temp2(_result2) {
-            if (_exit2) return _result2;
+            if (_exit) return _result2;
             if (!tokenAddress || !targetAddress || !signer || !signerAddress) return;
             var erc20Contract = new contracts.Contract(tokenAddress, ERC20ABI.abi, signer);
             return Promise.resolve(erc20Contract.decimals()).then(function (decimals) {
@@ -6925,7 +6970,7 @@ function useAllowance() {
                   setDecimals(COIN_LIST['USDK'].decimals);
                   var parsedAccountInfo = accountInfo === null || accountInfo === void 0 ? void 0 : (_accountInfo$value = accountInfo.value) === null || _accountInfo$value === void 0 ? void 0 : _accountInfo$value.data;
                   setAllowance(((_parsedAccountInfo$pa = parsedAccountInfo.parsed) === null || _parsedAccountInfo$pa === void 0 ? void 0 : (_parsedAccountInfo$pa2 = _parsedAccountInfo$pa.info) === null || _parsedAccountInfo$pa2 === void 0 ? void 0 : _parsedAccountInfo$pa2.delegate) === targetAddress ? (_parsedAccountInfo$pa3 = parsedAccountInfo.parsed) === null || _parsedAccountInfo$pa3 === void 0 ? void 0 : (_parsedAccountInfo$pa4 = _parsedAccountInfo$pa3.info) === null || _parsedAccountInfo$pa4 === void 0 ? void 0 : (_parsedAccountInfo$pa5 = _parsedAccountInfo$pa4.delegatedAmount) === null || _parsedAccountInfo$pa5 === void 0 ? void 0 : _parsedAccountInfo$pa5.uiAmount : 0);
-                  _exit2 = true;
+                  _exit = true;
                 });
               });
             }
@@ -6941,8 +6986,8 @@ function useAllowance() {
   }, [signerAddress, tokenAddress, targetAddress, sourceChain, publicKey]);
   var approve = React.useCallback(function () {
     try {
-      var _temp8 = function _temp8(_result4) {
-        if (_exit4) return _result4;
+      var _temp7 = function _temp7(_result4) {
+        if (_exit2) return _result4;
         if (!signTransaction) return;
         var _temp5 = _catch(function () {
           dispatch(setApproving(true));
@@ -6969,17 +7014,17 @@ function useAllowance() {
         });
         if (_temp5 && _temp5.then) return _temp5.then(function () {});
       };
-      var _exit4 = false;
-      var _temp9 = function () {
+      var _exit2 = false;
+      var _temp6 = function () {
         if (isEVMChain(sourceChain)) {
-          var _temp10 = function _temp10() {
-            _exit4 = true;
+          var _temp4 = function _temp4() {
+            _exit2 = true;
           };
           if (!decimals || !tokenAddress || !signer || !targetAddress) {
-            _exit4 = true;
+            _exit2 = true;
             return;
           }
-          var _temp11 = _catch(function () {
+          var _temp3 = _catch(function () {
             var erc20Contract = new contracts.Contract(tokenAddress, ERC20ABI.abi, signer);
             dispatch(setApproving(true));
             return Promise.resolve(erc20Contract.approve(targetAddress, units.parseUnits((amount + serviceFee).toString(), decimals))).then(function (approve) {
@@ -6992,10 +7037,10 @@ function useAllowance() {
             errorHandler(error);
             dispatch(setApproving(false));
           });
-          return _temp11 && _temp11.then ? _temp11.then(_temp10) : _temp10(_temp11);
+          return _temp3 && _temp3.then ? _temp3.then(_temp4) : _temp4(_temp3);
         }
       }();
-      return Promise.resolve(_temp9 && _temp9.then ? _temp9.then(_temp8) : _temp8(_temp9));
+      return Promise.resolve(_temp6 && _temp6.then ? _temp6.then(_temp7) : _temp7(_temp6));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -7029,22 +7074,22 @@ var getFeeInUSD = function getFeeInUSD(sourceChain, targetChain, gasFee) {
 };
 var getPrice = function getPrice(sourceChain, targetChain) {
   try {
-    var _temp4 = function _temp4(_result) {
-      return _exit2 ? _result : [0, 0];
+    var _temp3 = function _temp3(_result) {
+      return _exit ? _result : [0, 0];
     };
-    var _exit2 = false;
-    var _temp5 = _catch(function () {
+    var _exit = false;
+    var _temp2 = _catch(function () {
       return Promise.resolve(fetch("https://api.coingecko.com/api/v3/simple/price?ids=" + CHAIN_NAMES_TO_GECKO_ID[sourceChain] + "," + CHAIN_NAMES_TO_GECKO_ID[targetChain] + "&vs_currencies=usd")).then(function (res) {
         return Promise.resolve(res.json()).then(function (price) {
           var _temp = Object.keys(price).length ? [price[CHAIN_NAMES_TO_GECKO_ID[sourceChain]].usd, price[CHAIN_NAMES_TO_GECKO_ID[targetChain]].usd] : [0, 0];
-          _exit2 = true;
+          _exit = true;
           return _temp;
         });
       });
     }, function (e) {
       console.log(e);
     });
-    return Promise.resolve(_temp5 && _temp5.then ? _temp5.then(_temp4) : _temp4(_temp5));
+    return Promise.resolve(_temp2 && _temp2.then ? _temp2.then(_temp3) : _temp3(_temp2));
   } catch (e) {
     return Promise.reject(e);
   }
@@ -7077,7 +7122,7 @@ function useServiceFee() {
     try {
       if (!sourceChain || !targetChain || !isReady || !walletAddress || !targetAddress || !nodeProviderQuery || !amount) return Promise.resolve();
       var gasFee = {};
-      var _temp7 = _catch(function () {
+      var _temp4 = _catch(function () {
         return Promise.resolve(fetchWrapper.get(nodeProviderQuery + "/kima-finance/kima/kima/gas_fee")).then(function (gasFeeData) {
           gasFeeData.gasFee.forEach(function (data) {
             gasFee[data.chainId] = data.fee;
@@ -7095,7 +7140,7 @@ function useServiceFee() {
       }, function (e) {
         console.log('rpc disconnected', e);
       });
-      return Promise.resolve(_temp7 && _temp7.then ? _temp7.then(function () {}) : void 0);
+      return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(function () {}) : void 0);
     } catch (e) {
       return Promise.reject(e);
     }
@@ -7122,7 +7167,7 @@ var AddressInputWizard = function AddressInputWizard() {
   return React__default.createElement("div", {
     className: "coin-select"
   }, React__default.createElement("p", null, "Select Target Address for Funding"), React__default.createElement("div", {
-    className: "address-input " + theme
+    className: "address-input " + theme.colorMode
   }, React__default.createElement("span", null, "Target Address:"), React__default.createElement(AddressInput, null)));
 };
 
@@ -7137,7 +7182,7 @@ function useCurrencyOptions() {
     if (!nodeProviderQuery || !originNetwork || !targetNetwork) return;
     (function () {
       try {
-        var _temp2 = _catch(function () {
+        var _temp = _catch(function () {
           return Promise.resolve(fetchWrapper.get(nodeProviderQuery + "/kima-finance/kima/kima/getCurrencies/" + originNetwork + "/" + targetNetwork)).then(function (coins) {
             var _coins$Currencies;
             setOptions(COIN_LIST[(_coins$Currencies = coins.Currencies) !== null && _coins$Currencies !== void 0 && _coins$Currencies.length ? coins.Currencies[0] : 'USDK']);
@@ -7145,7 +7190,7 @@ function useCurrencyOptions() {
         }, function (e) {
           console.log('rpc disconnected', e);
         });
-        return _temp2 && _temp2.then ? _temp2.then(function () {}) : void 0;
+        return _temp && _temp.then ? _temp.then(function () {}) : void 0;
       } catch (e) {
         Promise.reject(e);
       }
@@ -7159,11 +7204,7 @@ function useCurrencyOptions() {
 }
 
 var TransferWidget = function TransferWidget(_ref) {
-  var _titleOption$confirmT, _titleOption$initialT;
-  var _ref$theme = _ref.theme,
-    theme = _ref$theme === void 0 ? exports.ThemeOptions.light : _ref$theme,
-    _ref$fontSize = _ref.fontSize,
-    fontSize = _ref$fontSize === void 0 ? exports.FontSizeOptions.medium : _ref$fontSize,
+  var theme = _ref.theme,
     titleOption = _ref.titleOption,
     paymentTitleOption = _ref.paymentTitleOption;
   var dispatch = reactRedux.useDispatch();
@@ -7201,10 +7242,10 @@ var TransferWidget = function TransferWidget(_ref) {
   var backendUrl = reactRedux.useSelector(selectBackendUrl);
   var nodeProviderQuery = reactRedux.useSelector(selectNodeProviderQuery);
   React.useEffect(function () {
-    if (!walletAddress) return;
+    if (!walletAddress || !compliantOption) return;
     (function () {
       try {
-        var _temp2 = _catch(function () {
+        var _temp = _catch(function () {
           return Promise.resolve(fetchWrapper.post(backendUrl + "/compliant", JSON.stringify({
             address: walletAddress
           }))).then(function (res) {
@@ -7213,17 +7254,17 @@ var TransferWidget = function TransferWidget(_ref) {
         }, function (e) {
           console.log('xplorisk check failed', e);
         });
-        return _temp2 && _temp2.then ? _temp2.then(function () {}) : void 0;
+        return _temp && _temp.then ? _temp.then(function () {}) : void 0;
       } catch (e) {
         Promise.reject(e);
       }
     })();
-  }, [walletAddress]);
+  }, [walletAddress, compliantOption]);
   React.useEffect(function () {
-    if (!targetAddress) return;
+    if (!targetAddress || !compliantOption) return;
     (function () {
       try {
-        var _temp4 = _catch(function () {
+        var _temp2 = _catch(function () {
           return Promise.resolve(fetchWrapper.post(backendUrl + "/compliant", JSON.stringify({
             address: targetAddress
           }))).then(function (res) {
@@ -7232,12 +7273,12 @@ var TransferWidget = function TransferWidget(_ref) {
         }, function (e) {
           console.log('xplorisk check failed', e);
         });
-        return _temp4 && _temp4.then ? _temp4.then(function () {}) : void 0;
+        return _temp2 && _temp2.then ? _temp2.then(function () {}) : void 0;
       } catch (e) {
         Promise.reject(e);
       }
     })();
-  }, [targetAddress]);
+  }, [targetAddress, compliantOption]);
   React.useEffect(function () {
     if (!nodeProviderQuery) return;
     try {
@@ -7288,7 +7329,7 @@ var TransferWidget = function TransferWidget(_ref) {
   };
   var handleSubmit = function handleSubmit() {
     try {
-      var _exit3 = false;
+      var _exit = false;
       if (!isApproved) {
         approve();
         return Promise.resolve();
@@ -7299,7 +7340,7 @@ var TransferWidget = function TransferWidget(_ref) {
         return Promise.resolve(checkPoolBalance()).then(function (_checkPoolBalance) {
           if (!_checkPoolBalance) {
             dispatch(setSubmitting(false));
-            _exit3 = true;
+            _exit = true;
             return;
           }
           var params = JSON.stringify({
@@ -7405,14 +7446,18 @@ var TransferWidget = function TransferWidget(_ref) {
     dispatch(setTheme(theme));
   }, [theme]);
   return React__default.createElement("div", {
-    className: "kima-card " + theme + " font-" + fontSize
+    className: "kima-card " + theme.colorMode + " font-" + theme.fontSize,
+    style: {
+      fontFamily: theme.fontFamily,
+      background: theme.colorMode === exports.ColorModeOptions.light ? theme.backgroundColorLight : theme.backgroundColorDark
+    }
   }, React__default.createElement("div", {
     className: 'kima-card-header'
   }, React__default.createElement("div", {
     className: 'topbar'
   }, React__default.createElement("div", {
     className: 'title'
-  }, React__default.createElement("h3", null, isWizard && wizardStep === 3 || !isWizard && formStep > 0 ? (_titleOption$confirmT = titleOption === null || titleOption === void 0 ? void 0 : titleOption.confirmTitle) != null ? _titleOption$confirmT : 'Transfer Details' : (_titleOption$initialT = titleOption === null || titleOption === void 0 ? void 0 : titleOption.initialTitle) != null ? _titleOption$initialT : 'New Transfer')), React__default.createElement("div", {
+  }, React__default.createElement("h3", null, isWizard && wizardStep === 3 || !isWizard && formStep > 0 ? titleOption !== null && titleOption !== void 0 && titleOption.confirmTitle ? titleOption === null || titleOption === void 0 ? void 0 : titleOption.confirmTitle : 'Transfer Details' : titleOption !== null && titleOption !== void 0 && titleOption.initialTitle ? titleOption === null || titleOption === void 0 ? void 0 : titleOption.initialTitle : 'New Transfer')), React__default.createElement("div", {
     className: 'control-buttons'
   }, React__default.createElement(ExternalLink, {
     to: 'https://docs.kima.finance/demo'
@@ -7425,7 +7470,7 @@ var TransferWidget = function TransferWidget(_ref) {
       closeHandler();
     }
   }, React__default.createElement(Cross, {
-    fill: theme === 'light' ? 'black' : 'white'
+    fill: theme.colorMode === 'light' ? 'black' : 'white'
   }))))), React__default.createElement("div", {
     className: 'kima-card-content'
   }, isWizard ? wizardStep === 0 ? React__default.createElement(Network, null) : wizardStep === 1 ? React__default.createElement("div", {
@@ -7443,14 +7488,14 @@ var TransferWidget = function TransferWidget(_ref) {
   })), React__default.createElement("div", {
     className: 'kima-card-footer'
   }, React__default.createElement(FooterLogo, {
-    fill: theme === 'light' ? 'black' : '#C5C5C5'
+    fill: theme.colorMode === 'light' ? 'black' : '#C5C5C5'
   }), React__default.createElement(SecondaryButton, {
     clickHandler: function clickHandler() {
       setWizard(function (prev) {
         return !prev;
       });
     },
-    theme: theme,
+    theme: theme.colorMode,
     style: {
       style: {
         width: '12em',
@@ -7459,7 +7504,7 @@ var TransferWidget = function TransferWidget(_ref) {
     }
   }, "Switch to ", isWizard ? 'Form' : 'Wizard'), React__default.createElement(SecondaryButton, {
     clickHandler: onBack,
-    theme: theme
+    theme: theme.colorMode
   }, isWizard && wizardStep > 0 || !isWizard && formStep > 0 ? 'Back' : 'Cancel'), React__default.createElement(PrimaryButton, {
     clickHandler: onNext,
     isLoading: isApproving || isSubmitting
@@ -7469,10 +7514,12 @@ var TransferWidget = function TransferWidget(_ref) {
 var KimaTransactionWidget = function KimaTransactionWidget(_ref) {
   var mode = _ref.mode,
     txId = _ref.txId,
-    _ref$theme = _ref.theme,
-    theme = _ref$theme === void 0 ? exports.ThemeOptions.light : _ref$theme,
-    _ref$fontSize = _ref.fontSize,
-    fontSize = _ref$fontSize === void 0 ? exports.FontSizeOptions.medium : _ref$fontSize,
+    _ref$autoConnect = _ref.autoConnect,
+    autoConnect = _ref$autoConnect === void 0 ? false : _ref$autoConnect,
+    provider = _ref.provider,
+    _ref$dAppOption = _ref.dAppOption,
+    dAppOption = _ref$dAppOption === void 0 ? exports.DAppOptions.None : _ref$dAppOption,
+    theme = _ref.theme,
     titleOption = _ref.titleOption,
     paymentTitleOption = _ref.paymentTitleOption,
     _ref$useFIAT = _ref.useFIAT,
@@ -7506,6 +7553,9 @@ var KimaTransactionWidget = function KimaTransactionWidget(_ref) {
     dispatch(setBackendUrl(kimaBackendUrl));
     dispatch(setNodeProviderQuery(kimaNodeProviderQuery));
     dispatch(setMode(mode));
+    dispatch(setProvider(provider));
+    dispatch(setDappOption(dAppOption));
+    dispatch(setWalletAutoConnect(autoConnect));
     if (mode === exports.ModeOptions.payment) {
       dispatch(setTargetNetwork((transactionOption === null || transactionOption === void 0 ? void 0 : transactionOption.targetChain) || exports.SupportNetworks.ETHEREUM));
       dispatch(setUseFIAT(useFIAT));
@@ -7514,7 +7564,7 @@ var KimaTransactionWidget = function KimaTransactionWidget(_ref) {
       }
       (function () {
         try {
-          var _temp4 = function _temp4() {
+          var _temp3 = function _temp3() {
             return _catch(function () {
               var _temp = function () {
                 if (transactionOption !== null && transactionOption !== void 0 && transactionOption.targetAddress) {
@@ -7530,14 +7580,14 @@ var KimaTransactionWidget = function KimaTransactionWidget(_ref) {
               console.log('xplorisk check failed', e);
             });
           };
-          var _temp5 = _catch(function () {
+          var _temp2 = _catch(function () {
             return Promise.resolve(fetchWrapper.get(kimaNodeProviderQuery + "/kima-finance/kima/kima/get_available_chains/" + ((transactionOption === null || transactionOption === void 0 ? void 0 : transactionOption.targetChain) || exports.SupportNetworks.ETHEREUM))).then(function (networks) {
               dispatch(setOriginNetwork(networks.Chains[0]));
             });
           }, function (e) {
             console.log('rpc disconnected', e);
           });
-          return _temp5 && _temp5.then ? _temp5.then(_temp4) : _temp4(_temp5);
+          return _temp2 && _temp2.then ? _temp2.then(_temp3) : _temp3(_temp2);
         } catch (e) {
           Promise.reject(e);
         }
@@ -7548,28 +7598,28 @@ var KimaTransactionWidget = function KimaTransactionWidget(_ref) {
       dispatch(setTxId(txId || 1));
       dispatch(setSubmitted(true));
     } else {
-      dispatch(setOriginNetwork('ETH'));
+      if (dAppOption === exports.DAppOptions.G$) dispatch(setOriginNetwork('CEL'));else if (dAppOption === exports.DAppOptions.None) dispatch(setOriginNetwork('ETH'));
     }
-  }, [theme, transactionOption, errorHandler, closeHandler, mode]);
+  }, [provider, theme, transactionOption, errorHandler, closeHandler, mode]);
   return submitted ? React__default.createElement(TransactionWidget, {
-    theme: theme,
-    fontSize: fontSize
+    theme: theme
   }) : React__default.createElement(TransferWidget, {
     theme: theme,
-    fontSize: fontSize,
     titleOption: titleOption,
     paymentTitleOption: paymentTitleOption
   });
 };
 
+var ConnectionProvider = SolanaAdapter.ConnectionProvider,
+  WalletProvider = SolanaAdapter.WalletProvider;
 var KimaProvider = function KimaProvider(_ref) {
   var children = _ref.children;
   var wallets = [new walletAdapterWallets.PhantomWalletAdapter(), new walletAdapterWallets.SolflareWalletAdapter(), new walletAdapterWallets.SolletWalletAdapter(), new walletAdapterWallets.SolletExtensionWalletAdapter(), new walletAdapterWallets.CloverWalletAdapter(), new walletAdapterWallets.Coin98WalletAdapter(), new walletAdapterWallets.SlopeWalletAdapter(), new walletAdapterWallets.SolongWalletAdapter(), new walletAdapterWallets.TorusWalletAdapter()];
   return React__default.createElement(reactRedux.Provider, {
     store: store
-  }, React__default.createElement(EthereumProvider, null, React__default.createElement(walletAdapterReact.ConnectionProvider, {
+  }, React__default.createElement(EthereumProvider, null, React__default.createElement(ConnectionProvider, {
     endpoint: SOLANA_HOST
-  }, React__default.createElement(walletAdapterReact.WalletProvider, {
+  }, React__default.createElement(WalletProvider, {
     wallets: wallets
   }, children))));
 };