Merge branch 'master' into development_tri/implementasi_raja_ongkir

# Conflicts:
#	src/lib/checkout/components/Checkout.jsx

1 files changed, 6 insertions, 6 deletions

diff --git a/src/core/components/elements/Navbar/NavbarDesktop.jsx b/src/core/components/elements/Navbar/NavbarDesktop.jsx
index 837d436c..3da0035a 100644
--- a/src/core/components/elements/Navbar/NavbarDesktop.jsx
+++ b/src/core/components/elements/Navbar/NavbarDesktop.jsx
@@ -14,6 +14,8 @@ import { useEffect, useState } from 'react'
 import useAuth from '@/core/hooks/useAuth'
 import NavbarUserDropdown from './NavbarUserDropdown'
 import { getCart } from '@/core/utils/cart'
+import TopBanner from './TopBanner'
+import whatsappUrl from '@/core/utils/whatsappUrl'
 
 const Search = dynamic(() => import('./Search'))
 
@@ -38,19 +40,17 @@ const NavbarDesktop = () => {
 
   return (
     <DesktopView>
+      <TopBanner />
       <div className='py-3 bg-warning-400' id='desktop-nav-top'>
         <div className='container mx-auto flex justify-between'>
-          <Link href='/' className='!text-gray_r-12'>
+          <Link href='/tentang-kami' className='!text-gray_r-12'>
             Tentang Indoteknik.com
           </Link>
           <div className='flex gap-x-6'>
-            <Link href='/' className='!text-gray_r-12'>
+            <Link href='/my/pembayaran-tempo' className='!text-gray_r-12'>
               Pembayaran Tempo
             </Link>
             <Link href='/' className='!text-gray_r-12'>
-              F.A.Q
-            </Link>
-            <Link href='/' className='!text-gray_r-12'>
               Fitur Layanan
             </Link>
           </div>
@@ -90,7 +90,7 @@ const NavbarDesktop = () => {
               Wishlist
             </Link>
             <a
-              href='https://wa.me/628128080622'
+              href={whatsappUrl()}
               target='_blank'
               rel='noreferrer'
               className='flex items-center gap-x-1 !text-gray_r-12/80'