Skip to content

Commit eeb5655

Browse files
committed
refactor: code refactor
1 parent b55b6d5 commit eeb5655

4 files changed

Lines changed: 5 additions & 14 deletions

File tree

src/Components/DynamicFields.res

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -336,14 +336,9 @@ let make = (
336336
fieldsArr->Array.filter(field => !(field->isFieldTypeToRenderOutsideBilling))
337337
}, [fieldsArr])
338338

339-
let isInfoElementPresent = dynamicFieldsToRenderInsideBilling->Array.includes(InfoElement)
339+
let isInfoElementPresent = dynamicFieldsToRenderOutsideBilling->Array.includes(InfoElement)
340340

341-
let isOnlyInfoElementPresent =
342-
dynamicFieldsToRenderInsideBilling->Array.length === 1 && isInfoElementPresent
343-
344-
let isRenderDynamicFieldsInsideBilling =
345-
dynamicFieldsToRenderInsideBilling->Array.length > 0 &&
346-
(dynamicFieldsToRenderInsideBilling->Array.length > 1 || !isOnlyInfoElementPresent)
341+
let isRenderDynamicFieldsInsideBilling = dynamicFieldsToRenderInsideBilling->Array.length > 0
347342

348343
let spacedStylesForBiilingDetails = isSpacedInnerLayout ? "p-2" : "my-2"
349344

@@ -857,19 +852,16 @@ let make = (
857852
</div>
858853
</div>
859854
</RenderIf>
855+
<Surcharge paymentMethod paymentMethodType />
860856
<RenderIf condition={isInfoElementPresent}>
861857
{<>
862-
<Surcharge paymentMethod paymentMethodType />
863858
{if fieldsArr->Array.length > 1 {
864859
bottomElement
865860
} else {
866861
<Block bottomElement />
867862
}}
868863
</>}
869864
</RenderIf>
870-
<RenderIf condition={!isInfoElementPresent}>
871-
<Surcharge paymentMethod paymentMethodType />
872-
</RenderIf>
873865
</>}
874866
</RenderIf>
875867
}

src/Utilities/DynamicFieldsUtils.res

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,8 @@ let isFieldTypeToRenderOutsideBilling = (fieldType: PaymentMethodsRecord.payment
769769
| IBAN
770770
| DestinationBankAccountId
771771
| SourceBankAccountId
772-
| BankAccountNumber => true
772+
| BankAccountNumber
773+
| InfoElement => true
773774
| _ => false
774775
}
775776
}

src/Utilities/PaymentBody.res

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1069,6 +1069,5 @@ let getPaymentBody = (
10691069
| "evoucher" =>
10701070
rewardBody(~paymentMethodType)
10711071
| "eft" => eftBody()
1072-
| "klarna" => dynamicPaymentBody(paymentMethod, paymentMethodType)
10731072
| _ => dynamicPaymentBody(paymentMethod, paymentMethodType)
10741073
}

src/Utilities/PaymentBodyV2.res

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,5 @@ let getPaymentBody = (
5555
) =>
5656
switch paymentMethodType {
5757
| "eps" => epsBody(~name=fullName, ~bankName=bank)
58-
| "klarna" => dynamicPaymentBodyV2(paymentMethod, paymentMethodType)
5958
| _ => dynamicPaymentBodyV2(paymentMethod, paymentMethodType)
6059
}

0 commit comments

Comments
 (0)