From 6c26e01114e34e1bd56ba62d5924993682ac96cd Mon Sep 17 00:00:00 2001
From: Oleksii Trukhanov <trukhantech@gmail.com>
Date: Wed, 19 Apr 2023 22:37:27 +0300
Subject: [PATCH] DASH-650 Fix free private domain register on fio payment
 processor

---
 client/src/components/PurchaseNow/PurchaseNow.tsx | 8 ++++++--
 client/src/components/PurchaseNow/middleware.ts   | 5 ++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/client/src/components/PurchaseNow/PurchaseNow.tsx b/client/src/components/PurchaseNow/PurchaseNow.tsx
index 67a6781f4..e240564b9 100644
--- a/client/src/components/PurchaseNow/PurchaseNow.tsx
+++ b/client/src/components/PurchaseNow/PurchaseNow.tsx
@@ -106,13 +106,17 @@ export const PurchaseNow: React.FC<PurchaseNowTypes> = props => {
     for (const item of cartItems) {
       if (
         (item.costNativeFio && item.domainType !== DOMAIN_TYPE.FREE) ||
-        hasFreeAddress
+        (hasFreeAddress && item.domainType !== DOMAIN_TYPE.PRIVATE)
       ) {
         setSubmitData({
           cartItems,
           prices,
           refProfileInfo,
-          isFreeAllowed: !hasFreeAddress,
+          isFreeAllowed:
+            !hasFreeAddress ||
+            cartItems.some(
+              cartItem => cartItem.domainType === DOMAIN_TYPE.PRIVATE,
+            ),
         });
         return;
       }
diff --git a/client/src/components/PurchaseNow/middleware.ts b/client/src/components/PurchaseNow/middleware.ts
index 02179daa5..9f809f7dc 100644
--- a/client/src/components/PurchaseNow/middleware.ts
+++ b/client/src/components/PurchaseNow/middleware.ts
@@ -23,7 +23,9 @@ export const makeRegistrationOrder = (
       fioName: setFioName(cartItem.address, cartItem.domain),
       isFree:
         isFreeAllowed &&
-        (!cartItem.costNativeFio || cartItem.domainType === DOMAIN_TYPE.FREE) &&
+        (!cartItem.costNativeFio ||
+          cartItem.domainType === DOMAIN_TYPE.FREE ||
+          cartItem.domainType === DOMAIN_TYPE.PRIVATE) &&
         !!cartItem.address,
       fee: [CART_ITEM_TYPE.DOMAIN_RENEWAL, CART_ITEM_TYPE.ADD_BUNDLES].includes(
         cartItem.type,
@@ -53,6 +55,7 @@ export const makeRegistrationOrder = (
     if (
       !cartItem.costNativeFio ||
       cartItem.domainType === DOMAIN_TYPE.FREE ||
+      cartItem.domainType === DOMAIN_TYPE.PRIVATE ||
       !cartItem.address
     ) {
       registrations.push(registration);