enhacnements

src/pages/cart/components/TableNumberCard.tsx

@@ -64,11 +64,6 @@ export default function TableNumberCard() {
       >
         {isEditing || table === "" ? (
           <Form.Item
-            label={
-              orderType === OrderType.DineIn
-                ? t("cart.tableNumber")
-                : t("cart.selectCompany")
-            }
             name="table"
             required
             rules={[
@@ -81,7 +76,6 @@ export default function TableNumberCard() {
               },
             ]}
             initialValue={table}
-            style={{ position: "relative", top: -5 }}
           >
             <Select
               value={table}
@@ -103,9 +97,8 @@ export default function TableNumberCard() {
                 borderRadius: 888,
               }}
               onChange={(value) => {
-                console.log(value);
                 dispatch(updateTables(value));
-                setIsEditing(false);
+                if(value) setIsEditing(false);
               }}
               onClear={() => {
                 dispatch(removeTable());

src/pages/order/page.tsx

@@ -259,13 +259,12 @@ export default function OrderPage() {
               <div>
                 <ProText
                   style={{
-                    fontFamily:"Bold/Caption Bold",
+                    fontFamily: "Bold/Caption Bold",
                     fontSize: "12px",
                     lineHeight: "140%",
                     letterSpacing: "0%",
                     fontWeight: "bold",
-
-                    color:"#434E5C"
+                    color: "#434E5C",
                   }}
                 >
                   {t("order.yourOrderFromFascanoRestaurant")}
@@ -538,7 +537,7 @@ export default function OrderPage() {
             onClose={() => setIsRateOrderOpen(false)}
           />
 
-          <CancelOrderBottomSheet />
+          {!hasClosedStatus && <CancelOrderBottomSheet />}
         </Layout.Content>
         {hasClosedStatus && (
           <Layout.Footer className={styles.checkoutButtonContainer}>