cleanup & update style

RegionX-Labs · Aug 18, 2024 · 48cd241 · 48cd241
1 parent d354c8a
commit 48cd241
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 108 deletions.
diff --git a/src/components/Orders/Modals/OrderProcessor/index.tsx b/src/components/Orders/Modals/OrderProcessor/index.tsx
@@ -18,7 +18,7 @@ import { useState } from 'react';
 import { useSubmitExtrinsic } from '@/hooks/submitExtrinsic';
 import { getBalanceString } from '@/utils/functions';
 
-import { ActionButton } from '@/components/Elements';
+import { ProgressButton } from '@/components/Elements';
 
 import { useAccounts } from '@/contexts/account';
 import { useRegionXApi, useRelayApi } from '@/contexts/apis';
@@ -198,24 +198,29 @@ export const OrderProcessorModal = ({
         </Box>
       </DialogContent>
       <DialogActions>
-        <Stack width='100%' gap='0.5rem' mt='1.5rem'>
+        <Box width='100%' gap='0.5rem' mt='1.5rem' display='flex'>
           <Button
+            onClick={onClose}
+            variant='outlined'
             fullWidth
-            variant='contained'
             sx={{
               borderRadius: '1rem',
             }}
-            onClick={onProcess}
-            disabled={!checkRequirements(order, regionSelected) || working}
+            data-cy='btn-close-order-processor-modal'
           >
-            Fulfill
+            Close
           </Button>
-          <ActionButton
-            label='Close'
-            onClick={onClose}
-            data-cy='btn-close-order-processor-modal'
+          <ProgressButton
+            fullWidth
+            label='Fulfill'
+            sx={{
+              borderRadius: '1rem',
+            }}
+            onClick={onProcess}
+            disabled={!checkRequirements(order, regionSelected) || working}
+            loading={working}
           />
-        </Stack>
+        </Box>
       </DialogActions>
     </Dialog>
   );

diff --git a/src/contexts/orders/index.tsx b/src/contexts/orders/index.tsx
@@ -112,7 +112,7 @@ const OrderProvider = ({ children }: Props) => {
                   ...item,
                   totalContribution: parseInt(item.contribution),
                   contribution: await getContribution(item.orderId),
-                } as Order)
+                }) as Order
             )
           )
         );

diff --git a/src/hooks/order/processed.ts b/src/hooks/order/processed.ts
@@ -58,7 +58,7 @@ export const useProcessedOrders = () => {
                   mask,
                   account: seller,
                   reward,
-                } as OrderItem)
+                }) as OrderItem
             )
           );
         }

diff --git a/src/hooks/order/regions.ts b/src/hooks/order/regions.ts
diff --git a/src/pages/orders/index.tsx b/src/pages/orders/index.tsx
@@ -5,7 +5,6 @@ import {
   CircularProgress,
   FormControlLabel,
   Paper,
-  Stack,
   Switch,
   Typography,
   useTheme,
@@ -127,21 +126,7 @@ const OrderDashboard = () => {
           {ordersToShow.map((order: Order, index: number) => (
             <Paper key={index} sx={{ padding: '1.5rem' }}>
               <OrderCard order={order} />
-              <Stack direction='column' gap='.5rem' mt='1.5rem'>
-                <Button
-                  fullWidth
-                  variant='contained'
-                  sx={{
-                    borderRadius: '1rem',
-                  }}
-                  onClick={() => {
-                    openContributionModal(true);
-                    selectOrder(order);
-                  }}
-                  disabled={activeAccount === null}
-                >
-                  Contribute
-                </Button>
+              <Box display='flex' gap='.5rem' mt='1.5rem'>
                 <Button
                   onClick={() => {
                     openProcessorModal(true);
@@ -156,7 +141,21 @@ const OrderDashboard = () => {
                 >
                   Fulfill Order
                 </Button>
-              </Stack>
+                <Button
+                  fullWidth
+                  variant='contained'
+                  sx={{
+                    borderRadius: '1rem',
+                  }}
+                  onClick={() => {
+                    openContributionModal(true);
+                    selectOrder(order);
+                  }}
+                  disabled={activeAccount === null}
+                >
+                  Contribute
+                </Button>
+              </Box>
             </Paper>
           ))}
         </Box>