fix: send crash

bob-collective · Jul 22, 2024 · 3a55488 · 3a55488
1 parent 643e6bd
commit 3a55488
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 330 deletions.
diff --git a/apps/hybrid-pay/src/lib/form/yup.custom.ts b/apps/hybrid-pay/src/lib/form/yup.custom.ts
@@ -8,7 +8,7 @@ import { isAddress } from 'viem';
 
 yup.addMethod<yup.StringSchema>(yup.string, 'requiredAmount', function (action: string, customMessage?: string) {
   return this.transform((value) => (isNaN(value) ? undefined : value)).test('requiredAmount', (value, ctx) => {
-    if (value === undefined) {
+    if (value === undefined || value === '') {
       const message = customMessage || `Please enter the amount to ${action}`;
 
       return ctx.createError({ message });
@@ -27,7 +27,7 @@ yup.addMethod<yup.StringSchema>(
   'maxAmount',
   function ({ maxAmount }: MaxAmountValidationParams, action?: string, customMessage?: string) {
     return this.test('maxAmount', (value, ctx) => {
-      if (value === undefined) return true;
+      if (value === undefined || value === '') return true;
 
       const amount = new Big(value);
 
@@ -51,7 +51,7 @@ yup.addMethod<yup.StringSchema>(
   'minAmount',
   function ({ minAmount }: MinAmountValidationParams = {}, action: string, customMessage?: string) {
     return this.test('balance', (value, ctx) => {
-      if (value === undefined) return true;
+      if (value === undefined || value === '') return true;
 
       const amount = new Big(value);
 

diff --git a/apps/hybrid-pay/src/pages/Send/components/ButtonGroup/ButtonGroup.tsx b/apps/hybrid-pay/src/pages/Send/components/ButtonGroup/ButtonGroup.tsx
@@ -13,9 +13,9 @@ type InheritAttrs = Omit<FlexProps, (keyof Props & AriaAttrs) | 'children'>;
 
 type HeaderProps = Props & AriaAttrs & InheritAttrs;
 
-const ButtonGroup = ({ ...props }: HeaderProps): JSX.Element => {
+const ButtonGroup = ({ onSelectionChange, selectionMode, ...props }: HeaderProps): JSX.Element => {
   const domRef = useDOMRef<HTMLDivElement>(null);
-  let state = useListState(props);
+  let state = useListState({ ...props, onSelectionChange, selectionMode });
   let { gridProps } = useTagGroup(props, state, domRef);
 
   return (

diff --git a/apps/hybrid-pay/src/pages/Send/components/TokenButtonGroup/TokenButtonGroup.tsx b/apps/hybrid-pay/src/pages/Send/components/TokenButtonGroup/TokenButtonGroup.tsx
@@ -58,6 +58,7 @@ const TokenButtonGroup = ({ isSelected, currency, onSelectionChange }: HeaderPro
 
   return (
     <ButtonGroup
+      aria-label='send amount options'
       flex={1}
       gap='md'
       justifyContent='space-between'
@@ -80,23 +81,6 @@ const TokenButtonGroup = ({ isSelected, currency, onSelectionChange }: HeaderPro
           )}
         </Item>
       ))}
-
-      {/* <Item textValue='1'>
-        <Flex direction='column'>
-          <Span size='s'>{Intl.NumberFormat(locale).format(16000)}</Span>
-          <Span color='grey-200' size='s'>
-            {format(10)}
-          </Span>
-        </Flex>
-      </Item>
-      <Item textValue='2'>
-        <Flex direction='column'>
-          <Span size='s'>{Intl.NumberFormat(locale).format(32000)}</Span>
-          <Span color='grey-200' size='s'>
-            {format(20)}
-          </Span>
-        </Flex>
-      </Item> */}
     </ButtonGroup>
   );
 };