fix: ui

apps/hybrid-pay/api/index.js

@@ -1,31 +1,13 @@
 import { createProxyMiddleware } from 'http-proxy-middleware';
 
-const CHAIN = process.env.CHAIN || 'mainnet';
-
-const API_URL = {
-  mainnet: 'https://fusion-api.gobob.xyz',
-  sepolia: 'https://fusion-api-sepolia.gobob.xyz'
-};
-
-const ONRAMP_API_URL = {
-  mainnet: 'https://onramp-api-mainnet.gobob.xyz',
-  sepolia: 'https://onramp-api-testnet.gobob.xyz'
-};
-
-const BTC_API_URL = {
-  mainnet: 'https://btc-mainnet.gobob.xyz',
-  sepolia: 'https://btc-testnet.gobob.xyz'
-};
-
 const proxyMiddleware = createProxyMiddleware({
-  target: API_URL[CHAIN],
+  target: 'https://app.gobob.xyz/api',
   router: {
-    '/dynamic-api': API_URL[CHAIN],
-    '/onramp-api': ONRAMP_API_URL[CHAIN],
-    '/btc-api': BTC_API_URL[CHAIN]
+    '/api': 'https://app.gobob.xyz/api',
+    '/dynamic-api': 'https://app.dynamicauth.com/api/v0'
   },
   changeOrigin: true,
-  pathRewrite: { '^/dynamic-api': '', '^/onramp-api': '', '^/btc-api': '' },
+  pathRewrite: { '^/dynamic-api': '', '^/api': '' },
   on: {
     proxyReq: (proxyReq) => {
       proxyReq.setHeader('x-sec-token', 'foobar');

apps/hybrid-pay/package.json

@@ -13,11 +13,11 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@dynamic-labs/bitcoin": "^2.2.10",
-    "@dynamic-labs/ethereum": "^2.2.10",
-    "@dynamic-labs/ethereum-aa": "^2.2.10",
-    "@dynamic-labs/sdk-react-core": "^2.2.10",
-    "@dynamic-labs/wagmi-connector": "^2.2.10",
+    "@dynamic-labs/bitcoin": "^v3.0.0-alpha.22",
+    "@dynamic-labs/ethereum": "^v3.0.0-alpha.22",
+    "@dynamic-labs/ethereum-aa": "^v3.0.0-alpha.22",
+    "@dynamic-labs/sdk-react-core": "^v3.0.0-alpha.22",
+    "@dynamic-labs/wagmi-connector": "^v3.0.0-alpha.22",
     "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
     "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
     "@gobob/chains": "workspace:^",
@@ -36,7 +36,7 @@
     "@react-stately/list": "^3.9.1",
     "@sentry/react": "^8.8.0",
     "@sentry/vite-plugin": "^2.18.0",
-    "@zerodev/sdk": "^5.3.3",
+    "@zerodev/sdk": "^5.3.4",
     "big.js": "^6.2.1",
     "date-fns": "^3.2.0",
     "graphql-request": "6.1.0",

apps/hybrid-pay/src/App.tsx

@@ -23,7 +23,7 @@ const ScrollToTop = () => {
 
 const Wallet = lazy(() => import('./pages/Wallet'));
 const Send = lazy(() => import('./pages/Send'));
-const Recieve = lazy(() => import('./pages/Recieve'));
+const Receive = lazy(() => import('./pages/Receive'));
 const Custom404 = lazy(() => import('./pages/404'));
 
 const ProtectedRoute = ({ children }: { children: ReactNode }) => {
@@ -107,7 +107,7 @@ function App() {
             <Route
               element={
                 <ProtectedRoute>
-                  <Recieve />
+                  <Receive />
                 </ProtectedRoute>
               }
               path={RoutesPath.RECIEVE}

apps/hybrid-pay/src/components/Layout/Header.tsx

@@ -21,7 +21,7 @@ const Header = ({ ...props }: HeaderProps): JSX.Element => {
   return (
     <StyledHeader alignItems='center' elementType='header' justifyContent='space-between' {...props}>
       <StyledLogoWrapper alignItems='center' gap='md'>
-        {pathname === RoutesPath.HOME ? (
+        {pathname === RoutesPath.HOME || !isAuthenticated ? (
           <Logo to={RoutesPath.HOME} />
         ) : (
           <Flex alignItems='center'>

apps/hybrid-pay/src/hooks/useKernelClient.ts

@@ -43,7 +43,7 @@ const useKernelClient = (gasToken?: Currency) => {
     return;
   }
 
-  const paymaster = gasToken ? paymasters?.[CHAIN]?.[gasToken.symbol] : undefined;
+  const paymaster = gasToken ? paymasters?.[CHAIN as ChainId.BOB]?.[gasToken.symbol] : undefined;
 
   const dynamicAccountProvider = connector.getAccountAbstractionProvider();
 
@@ -91,6 +91,7 @@ const useKernelClient = (gasToken?: Currency) => {
             };
 
             // can't json-serialize bigints - convert them to strings
+            // @ts-ignore
             BigInt.prototype['toJSON'] = function () {
               return this.toString();
             };

apps/hybrid-pay/src/lib/form/transfer.ts

@@ -22,7 +22,6 @@ type TransferTokenFormValues = {
 
 type TransferTokenFormValidationParams = {
   [TRANSFER_TOKEN_AMOUNT]: MaxAmountValidationParams & MinAmountValidationParams;
-  [TRANSFER_TOKEN_RECIPIENT]?: 'evm' | 'email';
 };
 
 const transferTokenSchema = (params: TransferTokenFormValidationParams) => {

apps/hybrid-pay/src/pages/Recieve/Recieve.tsx → apps/hybrid-pay/src/pages/Receive/Receive.tsx

@@ -5,8 +5,9 @@ import { useAccount } from 'wagmi';
 import { truncateEthAddress } from '@gobob/utils';
 
 import { Main } from '../../components';
+import { RoutesPath } from '../../constants';
 
-const Recieve = () => {
+const Receive = () => {
   const { user } = useDynamicContext();
   const { address } = useAccount();
 
@@ -35,12 +36,12 @@ const Recieve = () => {
           fgColor='#ffffff'
           size={256}
           style={{ height: 'auto', maxWidth: '100%', width: '100%', background: 'transparent' }}
-          value={address!}
+          value={`${window.location.host}${RoutesPath.SEND}?to=${user?.email || address}`}
           viewBox={`0 0 256 256`}
         />
       </Flex>
     </Main>
   );
 };
 
-export { Recieve };
+export { Receive };

apps/hybrid-pay/src/pages/Receive/index.tsx

@@ -0,0 +1 @@
+export { Receive as default } from './Receive';

apps/hybrid-pay/src/pages/Send/Send.tsx

@@ -57,12 +57,14 @@ const Send = ({}: SendProps): JSX.Element => {
 
   const { user } = useDynamicContext();
 
-  const [ticker, setTicker] = useState(CHAIN === ChainId.BASE_SEPOLIA ? 'USDC' : searchParams.get('token') || 'WBTC');
+  const defaultTicker = CHAIN === ChainId.BASE_SEPOLIA ? 'USDC' : searchParams.get('token') || 'WBTC';
+
+  const [ticker, setTicker] = useState(defaultTicker);
   const [amount, setAmount] = useState('');
   const [isGroupAmount, setGroupAmount] = useState(false);
 
   const { getPrice } = usePrices({ baseUrl: import.meta.env.VITE_MARKET_DATA_API });
-  const { getBalance } = useBalances(CHAIN);
+  const { getBalance, balances, isPending } = useBalances(CHAIN);
 
   const { data: tokens } = useTokens(CHAIN);
 
@@ -146,10 +148,6 @@ const Send = ({}: SendProps): JSX.Element => {
     error: eoaTransferError
   } = useMutation({
     mutationKey: ['eoa-transfer', amount, form.values[TRANSFER_TOKEN_RECIPIENT]],
-    onSuccess: () => {
-      form.resetForm();
-      setAmount('');
-    },
     mutationFn: async ({
       recipient,
       currencyAmount
@@ -183,6 +181,11 @@ const Send = ({}: SendProps): JSX.Element => {
   useEffect(() => {
     if (eoaTransferTransactionReceipt?.status === 'success') {
       toast.success(`Successfully sent ${amount} ${token?.currency.symbol}`);
+
+      form.resetForm();
+      setAmount('');
+      setGroupAmount(false);
+      setTicker(defaultTicker);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [eoaTransferTransactionReceipt]);
@@ -207,12 +210,13 @@ const Send = ({}: SendProps): JSX.Element => {
       }
 
       toast.success(
-        `Successfully transfered ${variables.currencyAmount.numerator} ${variables.currencyAmount.currency.symbol}`
+        `Successfully transfered ${variables.currencyAmount.toExact()} ${variables.currencyAmount.currency.symbol}`
       );
 
       form.resetForm();
       setAmount('');
-      // eslint-disable-next-line react-hooks/exhaustive-deps
+      setGroupAmount(false);
+      setTicker(defaultTicker);
     },
     mutationFn: async ({
       recipient,
@@ -278,6 +282,13 @@ const Send = ({}: SendProps): JSX.Element => {
     }
   }, [smartAccountTransferError]);
 
+  useEffect(() => {
+    if (!isPending) {
+      form.validateField(TRANSFER_TOKEN_AMOUNT);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [balances, isPending]);
+
   const tokenInputItems = useMemo(
     () =>
       tokens?.map((token) => {
@@ -332,9 +343,10 @@ const Send = ({}: SendProps): JSX.Element => {
           currency={token.currency}
           isSelected={isGroupAmount}
           onSelectionChange={(currencyAmount) => {
-            form.setFieldValue(TRANSFER_TOKEN_AMOUNT, currencyAmount.toSignificant(), true);
+            form.setFieldValue(TRANSFER_TOKEN_AMOUNT, currencyAmount.toSignificant());
             form.setFieldTouched(TRANSFER_TOKEN_AMOUNT, true);
             setGroupAmount(true);
+            setTimeout(() => form.validateField(TRANSFER_TOKEN_AMOUNT), 0);
           }}
         />
         <Button color='primary' disabled={isSubmitDisabled} loading={isTransferLoading} size='xl' type='submit'>

apps/hybrid-pay/src/pages/Send/components/ButtonGroup/CardButton.style.tsx

@@ -2,8 +2,6 @@ import styled from 'styled-components';
 import { Card } from '@gobob/ui';
 
 const StyledCard = styled(Card)`
-  border: 1px solid transparent;
-
   &[aria-selected='true'] {
     border: 1px solid ${({ theme }) => theme.color('primary-500')};
     box-shadow: 0 0 0 1px ${({ theme }) => theme.color('primary-500')};

apps/hybrid-pay/src/pages/Wallet/Wallet.tsx

@@ -3,15 +3,13 @@ import { Main } from '../../components';
 import { StyledFlex } from './Wallet.style';
 import { Hero, TransactionList } from './components';
 
-const Wallet = () => {
-  return (
-    <Main maxWidth='5xl' padding='md'>
-      <StyledFlex direction='column'>
-        <Hero />
-        <TransactionList />
-      </StyledFlex>
-    </Main>
-  );
-};
+const Wallet = () => (
+  <Main maxWidth='5xl' padding='md'>
+    <StyledFlex direction='column'>
+      <Hero />
+      <TransactionList />
+    </StyledFlex>
+  </Main>
+);
 
 export { Wallet };

apps/hybrid-pay/vercel.json

@@ -6,10 +6,6 @@
     }
   },
   "rewrites": [
-    {
-      "source": "/check_access",
-      "destination": "/api/geoblock.js"
-    },
     {
       "source": "/tunnel",
       "destination": "/api/sentry.js"
@@ -19,7 +15,7 @@
       "destination": "/api/marketdata.js"
     },
     {
-      "source": "/(dynamic-api|onramp-api|btc-api)/(.*)",
+      "source": "/(dynamic-api|api)/(.*)",
       "destination": "/api"
     },
     {

apps/hybrid-pay/vite.config.ts

@@ -43,16 +43,6 @@ export default defineConfig(({ mode }) => {
           target: env.VITE_DYNAMIC_API_URL,
           changeOrigin: true,
           rewrite: (path) => path.replace(/^\/dynamic-api/, '')
-        },
-        '/onramp-api': {
-          target: env.VITE_ONRAMP_API_URL,
-          changeOrigin: true,
-          rewrite: (path) => path.replace(/^\/onramp-api/, '')
-        },
-        '/btc-api': {
-          target: env.VITE_BTC_API_URL,
-          changeOrigin: true,
-          rewrite: (path) => path.replace(/^\/btc-api/, '')
         }
       }
     }

packages/tokens/src/tokens.ts

@@ -16,5 +16,6 @@ export const tokens = {
   [ChainId.OPBNB]: [],
   [ChainId.POLYGON]: [],
   [ChainId.POLYGON_ZKEVM]: [],
-  [ChainId.MOONBEAM]: []
+  [ChainId.MOONBEAM]: [],
+  [ChainId.BASE_SEPOLIA]: []
 };