Merge pull request #3873 from beckn/staging-1.1.0

Staging 1.1.0

Author: aniketceminds

apps/deg-rental/components/modal/OpenWalletBottomModal.tsx

@@ -145,7 +145,7 @@ const OpenWalletBottomModal: React.FC<OpenWalletBottomModalProps> = ({ modalType
   const walletOptions = [
     { text: 'MetaMask Wallet', image: metaMaskWallet, handleClick: () => console.log('meta') },
     { text: 'OpenSea Wallet', image: openSeaWallet, handleClick: () => console.log('opensea') },
-    { text: 'Vault', image: openWallet, handleClick: () => setModalType('link') }
+    { text: 'Wallet', image: openWallet, handleClick: () => setModalType('link') }
   ]
 
   return (
@@ -190,7 +190,7 @@ const OpenWalletBottomModal: React.FC<OpenWalletBottomModalProps> = ({ modalType
           case 'link':
             return (
               <BottomModal
-                title="Link to your Vault profile"
+                title="Link to your Wallet profile"
                 isOpen={true}
                 onClose={() => setModalType(null)}
               >

apps/deg-retail/components/modal/OpenWalletBottomModal.tsx

@@ -153,7 +153,7 @@ const OpenWalletBottomModal: React.FC<OpenWalletBottomModalProps> = ({ modalType
   const walletOptions = [
     { text: 'MetaMask Wallet', image: metaMaskWallet, handleClick: () => console.log('meta') },
     { text: 'OpenSea Wallet', image: openSeaWallet, handleClick: () => console.log('opensea') },
-    { text: 'Vault', image: openWallet, handleClick: () => setModalType('link') }
+    { text: 'Wallet', image: openWallet, handleClick: () => setModalType('link') }
   ]
 
   return (
@@ -198,7 +198,7 @@ const OpenWalletBottomModal: React.FC<OpenWalletBottomModalProps> = ({ modalType
           case 'link':
             return (
               <BottomModal
-                title="Link to your Vault profile"
+                title="Link to your Wallet profile"
                 isOpen={true}
                 onClose={() => setModalType(null)}
               >

apps/deg-retail/pages/newPaymentOverView.tsx

@@ -1,6 +1,7 @@
 import { DetailCard } from '@beckn-ui/becknified-components'
 import {
   cartActions,
+  CheckoutRootState,
   DiscoveryRootState,
   ICartRootState,
   ParsedItemModel,
@@ -174,6 +175,7 @@ const NewPaymentOverView = () => {
           <Flex
             justifyContent={'space-between'}
             alignItems="center"
+            mb="15px"
           >
             <Typography
               fontSize="15px"
@@ -191,6 +193,47 @@ const NewPaymentOverView = () => {
               />
             </Flex>
           </Flex>
+          <Flex
+            justifyContent={'space-between'}
+            alignItems="center"
+            mb="15px"
+          >
+            <Typography
+              fontSize="15px"
+              text={'Processing Fee'}
+            />
+            <Flex alignItems={'center'}>
+              <Typography
+                fontSize="15px"
+                text={`+${currencyMap[getCountryCode().country.code as keyof typeof currencyMap]}`}
+                // style={{ paddingRight: '2px' }}
+              />
+              <Typography
+                fontSize="15px"
+                text={currencyFormat(emiDetails.processingFee)}
+              />
+            </Flex>
+          </Flex>
+          <Flex
+            justifyContent={'space-between'}
+            alignItems="center"
+          >
+            <Typography
+              fontSize="15px"
+              text={'Delivery Charges'}
+            />
+            <Flex alignItems={'center'}>
+              <Typography
+                fontSize="15px"
+                text={`+${currencyMap[getCountryCode().country.code as keyof typeof currencyMap]}`}
+                // style={{ paddingRight: '2px' }}
+              />
+              <Typography
+                fontSize="15px"
+                text={currencyFormat(emiDetails.deliveryCharges)}
+              />
+            </Flex>
+          </Flex>
           <Divider
             mt="15px"
             mb="15px"
@@ -216,7 +259,11 @@ const NewPaymentOverView = () => {
               <Typography
                 fontSize="15px"
                 fontWeight="600"
-                text={currencyFormat(Number(payableValue?.toFixed(2)))}
+                text={currencyFormat(
+                  Number(payableValue?.toFixed(2)) +
+                    Number(emiDetails.processingFee) +
+                    Number(emiDetails.deliveryCharges)
+                )}
               />
             </Flex>
           </Flex>