DASH-650 Fix free private domain register on fio payment processor

fioprotocol · Apr 20, 2023 · 6c26e01 · 6c26e01
1 parent 8b5ce9a
commit 6c26e01
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git 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
@@ -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);