Merge branch 'new-release' into feature/integrasi_biteship

# Conflicts:
#	src/lib/address/components/CreateAddress.jsx
#	src/lib/address/components/EditAddress.jsx

1 files changed, 8 insertions, 4 deletions

diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx
index 253a2b03..d6b1bdea 100644
--- a/src/core/components/elements/Navbar/NavbarDesktop.jsx
+++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx
@@ -117,7 +117,7 @@ const NavbarDesktop = () => {
     // };
     // handleCartChange();
 
-    setCartCount(cart?.products?.length)
+    setCartCount(cart?.products?.length);
 
     // window.addEventListener('localStorageChange', handleCartChange);
 
@@ -172,8 +172,8 @@ const NavbarDesktop = () => {
                 <MenuItem as='a' href='/tentang-kami'>
                   Tentang Indoteknik
                 </MenuItem>
-                <MenuItem as='a' href='/my/pembayaran-tempo'>
-                  Pembayaran Tempo
+                <MenuItem as='a' href='/pengajuan-tempo'>
+                  Pengajuan Tempo
                 </MenuItem>
               </MenuList>
             </Menu>
@@ -370,7 +370,11 @@ const NavbarDesktop = () => {
               )}
               {auth && (
                 <>
-                  <div href='/' className='navbar-user-dropdown-button' aria-label='User'>
+                  <div
+                    href='/'
+                    className='navbar-user-dropdown-button'
+                    aria-label='User'
+                  >
                     <span>Halo, {auth?.name}</span>
                     <div className='ml-auto'>
                       <ChevronDownIcon className='w-6' />