From 149bc296ab5dba49402bb72eecc3c5749c9446bd Mon Sep 17 00:00:00 2001
From: sonnguyenkieio <sonnguyen@kie.io>
Date: Thu, 16 Sep 2021 12:45:12 +0700
Subject: [PATCH] :bug: bug: fix bug in Account Page

---
 .../AccountPage/AccountPage.module.scss       | 19 +++++++++++--------
 .../OrderInformation/OrderInformation.tsx     |  6 +++---
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/components/modules/account/AccountPage/AccountPage.module.scss b/src/components/modules/account/AccountPage/AccountPage.module.scss
index 5eece6c80..5660d7707 100644
--- a/src/components/modules/account/AccountPage/AccountPage.module.scss
+++ b/src/components/modules/account/AccountPage/AccountPage.module.scss
@@ -1,23 +1,26 @@
 @import '../../../../styles/utilities';
 
 .accountPage {
-    @apply spacing-horizontal;
     background-color: #F5F4F2;
     margin-top: -3.2rem;
-    padding-top: 3.2rem;
-    padding-bottom: 3.2rem;
+    padding: 3.2rem 2rem;
     min-height: 70rem;
 
-
     @screen md {
-        padding-left: 3.2rem;
-        padding-right: 3.2rem;
+        padding-left: 2.8rem;
+        padding-right: 2.8rem;
+    }
+
+    @screen lg {
+        padding-left: 6.4rem;
+        padding-right: 6.4rem;
     }
 
     @screen xl {
-        @apply spacing-horizontal
+        padding-left: 11.2rem;
+        padding-right: 11.2rem;
     }
-
+   
     .header {
         margin-bottom: 1.2rem;
 
diff --git a/src/components/modules/account/AccountPage/components/OrderInformation/OrderInformation.tsx b/src/components/modules/account/AccountPage/components/OrderInformation/OrderInformation.tsx
index 858526f26..211cebe3b 100644
--- a/src/components/modules/account/AccountPage/components/OrderInformation/OrderInformation.tsx
+++ b/src/components/modules/account/AccountPage/components/OrderInformation/OrderInformation.tsx
@@ -25,7 +25,7 @@ const OrderInformation = ({ waiting, delivering, delivered} : OrderInformationPr
                         {
                             waiting.map((order, i) => {
                                 return (
-                                    <DeliveryItem key={order.id} id={order.id} status="Waiting" products={order.products} totalPrice={order.totalPrice} />
+                                    <DeliveryItem key={order.id} id={order.id} status="waiting" products={order.products} totalPrice={order.totalPrice} />
                                 )
                             }) 
                         }
@@ -36,7 +36,7 @@ const OrderInformation = ({ waiting, delivering, delivered} : OrderInformationPr
                         {
                             delivering.map((order, i) => {
                                 return (
-                                    <DeliveryItem key={order.id} id={order.id} status="Delivering" products={order.products} totalPrice={order.totalPrice} />
+                                    <DeliveryItem key={order.id} id={order.id} status="delivering" products={order.products} totalPrice={order.totalPrice} />
                                 )
                             }) 
                         }
@@ -47,7 +47,7 @@ const OrderInformation = ({ waiting, delivering, delivered} : OrderInformationPr
                         {
                             delivered.map((order, i) => {
                                 return (
-                                    <DeliveryItem key={order.id} id={order.id} status="Delivered" products={order.products} totalPrice={order.totalPrice} />
+                                    <DeliveryItem key={order.id} id={order.id} status="delivered" products={order.products} totalPrice={order.totalPrice} />
                                 )
                             }) 
                         }