Merge branch 'new-release' into bug-product

1 files changed, 9 insertions, 7 deletions

diff --git a/src/core/components/layouts/AppLayout.jsx b/src/core/components/layouts/AppLayout.jsx
index ebbc1ad5..ec61ca06 100644
--- a/src/core/components/layouts/AppLayout.jsx
+++ b/src/core/components/layouts/AppLayout.jsx
@@ -10,13 +10,15 @@ const BasicFooter = dynamic(() => import('../elements/Footer/BasicFooter'), {
 
 const AppLayout = ({ children, title, withFooter = true }) => {
   return (
-    <>
-      <AnimationLayout>
-        <AppBar title={title} />
-        {children}
-      </AnimationLayout>
-      {withFooter && <BasicFooter />}
-    </>
+    <div className='flex flex-col min-h-screen max-h-screen overflow-y-auto'>
+      <AppBar title={title} />
+      <div className='flex-grow p-4'>{children}</div>
+      {withFooter && (
+        <div className='mt-auto'>
+          <BasicFooter />
+        </div>
+      )}
+    </div>
   );
 };