Error handling of web3 communication, center miniCard image

SunDr17 · Jan 25, 2024 · 61b13d9 · 61b13d9
1 parent de755de
commit 61b13d9
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/src/components/common/MiniCard/MiniCard.tsx b/src/components/common/MiniCard/MiniCard.tsx
@@ -16,7 +16,7 @@ export default function MiniCard({ item }: { item: Item }) {
   function renderCard() {
     return (
       <Card bsPrefix={cn(styles['card-flyer'], 'text-center flex-fill card')}>
-        <div className="image-box pt-2">
+        <div className="image-box d-flex flex-grow-1 flex-column justify-content-center align-items-center pt-2">
           {isSvg(item.imageSrc)
             ? <FilledSvg
               src={item.imageSrc}
@@ -31,7 +31,7 @@ export default function MiniCard({ item }: { item: Item }) {
             />
           }
         </div>
-        <Card.Body>
+        <Card.Body className="d-flex flex-grow-0 flex-column justify-content-end align-items-center">
           <Card.Title>{item.fullName ?? item.name}</Card.Title>
           <Card.Text>
             {t('miniCard.price', { price: item.price })}

diff --git a/src/components/common/Modal/index.tsx b/src/components/common/Modal/index.tsx
@@ -29,7 +29,7 @@ function Modal(props: ModalType) {
       {...props}
       show={modal.show}
       onHide={onHide}
-      size="lg"
+      size={modalProps.size ?? 'lg'}
       aria-labelledby="contained-modal-title-vcenter"
       centered
     >

diff --git a/src/components/common/web3/SendTransactionButton.tsx b/src/components/common/web3/SendTransactionButton.tsx
@@ -28,13 +28,17 @@ export default function SendTransactionButton({
   } = useSendTransaction();
 
   async function sendTransactionClick() {
-    await sendTransactionAsync({
-      to: process.env.REACT_APP_WEB3_WALLET_BASE_ADDRESS as `0x${string}`,
-      value: parseEther(String(transactionSum)),
-    });
+    try {
+      await sendTransactionAsync({
+        to: process.env.REACT_APP_WEB3_WALLET_BASE_ADDRESS as `0x${string}`,
+        value: parseEther(String(transactionSum)),
+      });
 
-    if (onConfirm) {
-      onConfirm();
+      if (onConfirm) {
+        onConfirm();
+      }
+    } catch (e) {
+      // errors handled by useSendTransaction().error prop
     }
   }
 

diff --git a/src/components/pages/Home/FinishCycleModalButton.tsx b/src/components/pages/Home/FinishCycleModalButton.tsx
@@ -20,6 +20,7 @@ function FinishCycleModalButton({ onFinishCycle }: Props) {
 
   const openModal = () => {
     dispatch(showModal({
+      size: 'sm',
       onConfirm,
       header: t('finish_cycle_modal.header'),
       body: t('finish_cycle_modal.body'),

diff --git a/src/components/pages/ReferralProgram/index.tsx b/src/components/pages/ReferralProgram/index.tsx
@@ -48,7 +48,7 @@ export default function ReferralProgram() {
             secondaryCurrency: t(`currencies.${CURRENCIES.BNB}`),
           })}
         </p>
-        <SendTransactionButton transactionSum={referralBalanceInBnb} />
+        <SendTransactionButton transactionSum={Number(referralBalanceInBnb.toFixed(6))} />
       </div>
     </Container>
   );