Skip to content

Commit 958bb4b

Browse files
sakksham7sakksham7
committed
refactor: renamed variables and file
1 parent 656a1b5 commit 958bb4b

File tree

5 files changed

+39
-34
lines changed

5 files changed

+39
-34
lines changed

‎src/Components/SavedMethods.res‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ let make = (
4242
RecoilAtoms.optionAtom,
4343
)
4444
let layoutClass = CardUtils.getLayoutClass(layout)
45-
let isMergedSavedMethodsList = layoutClass.mergeSavedMethods.isMergedSavedMethodsList
45+
let displayMergedSavedMethods = layoutClass.savedMethodsLayout.displayMergedSavedMethods
4646
let isGuestCustomer = useIsGuestCustomer()
4747

4848
let {iframeId, clientSecret} = Recoil.useRecoilValueFromAtom(RecoilAtoms.keys)
@@ -71,8 +71,8 @@ let make = (
7171

7272
let (cardOptionDetails, dropDownOptionsDetails) = React.useMemo(() => {
7373
(
74-
savedMethods->Array.slice(~start=0, ~end=layoutClass.mergeSavedMethods.maxSavedItems),
75-
savedMethods->Array.sliceToEnd(~start=layoutClass.mergeSavedMethods.maxSavedItems),
74+
savedMethods->Array.slice(~start=0, ~end=layoutClass.savedMethodsLayout.maxSavedItems),
75+
savedMethods->Array.sliceToEnd(~start=layoutClass.savedMethodsLayout.maxSavedItems),
7676
)
7777
}, [savedMethods])
7878

@@ -105,7 +105,7 @@ let make = (
105105
let bottomElement = {
106106
<div
107107
className="PickerItemContainer" tabIndex={0} role="region" ariaLabel="Saved payment methods">
108-
<RenderIf condition={!isMergedSavedMethodsList}> {renderSavedCards(savedMethods)} </RenderIf>
108+
<RenderIf condition={!displayMergedSavedMethods}> {renderSavedCards(savedMethods)} </RenderIf>
109109
<RenderIf condition={clickToPayConfig.isReady == Some(true)}>
110110
<ClickToPayAuthenticate
111111
loggerState
@@ -359,21 +359,21 @@ let make = (
359359
savedCardlength === 0 &&
360360
!showPaymentMethodsScreen &&
361361
(loadSavedCards === PaymentType.LoadingSavedCards || clickToPayConfig.isReady->Option.isNone) &&
362-
!isMergedSavedMethodsList
362+
!displayMergedSavedMethods
363363
}, (
364364
savedCardlength,
365365
loadSavedCards,
366366
showPaymentMethodsScreen,
367367
clickToPayConfig.isReady,
368-
isMergedSavedMethodsList,
368+
displayMergedSavedMethods,
369369
))
370370

371371
<div className="flex flex-col overflow-auto h-auto no-scrollbar animate-slowShow">
372372
{if enableSavedPaymentShimmer {
373373
<PaymentElementShimmer.SavedPaymentCardShimmer />
374374
} else {
375375
<RenderIf condition={!showPaymentMethodsScreen}>
376-
{isMergedSavedMethodsList ? mergedViewBottomElement : bottomElement}
376+
{displayMergedSavedMethods ? mergedViewBottomElement : bottomElement}
377377
</RenderIf>
378378
}}
379379
<RenderIf condition={conditionsForShowingSaveCardCheckbox}>
@@ -391,7 +391,7 @@ let make = (
391391
}
392392
/>
393393
</RenderIf>
394-
<RenderIf condition={!enableSavedPaymentShimmer && !isMergedSavedMethodsList}>
394+
<RenderIf condition={!enableSavedPaymentShimmer && !displayMergedSavedMethods}>
395395
<div
396396
className="Label flex flex-row gap-3 items-end cursor-pointer mt-4"
397397
style={
@@ -417,6 +417,6 @@ let make = (
417417
{React.string(localeString.morePaymentMethods)}
418418
</div>
419419
</RenderIf>
420-
<ShowToggle isMergedSavedMethodsList dropDownOptionsDetails showMore setShowMore />
420+
<ShowMoreButton displayMergedSavedMethods dropDownOptionsDetails showMore setShowMore />
421421
</div>
422422
}

‎src/Components/ShowToggle.res‎ renamed to ‎src/Components/ShowMoreButton.res‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
@react.component
2-
let make = (~isMergedSavedMethodsList, ~dropDownOptionsDetails, ~showMore, ~setShowMore) => {
2+
let make = (~displayMergedSavedMethods, ~dropDownOptionsDetails, ~showMore, ~setShowMore) => {
33
let {themeObj} = Recoil.useRecoilValueFromAtom(RecoilAtoms.configAtom)
44

5-
<RenderIf condition={isMergedSavedMethodsList && dropDownOptionsDetails->Array.length > 0}>
5+
<RenderIf condition={displayMergedSavedMethods && dropDownOptionsDetails->Array.length > 0}>
66
<div
77
className="Label flex flex-row gap-1 items-end cursor-pointer mt-3"
88
style={

‎src/PaymentElement.res‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ let make = (~cardProps, ~expiryProps, ~cvcProps, ~paymentType: CardThemeType.mod
6060
}, (clickToPayConfig, isClickToPayAuthenticateError))
6161

6262
let layoutClass = CardUtils.getLayoutClass(layout)
63-
let isMergedSavedMethodsList = layoutClass.mergeSavedMethods.isMergedSavedMethodsList
63+
let displayMergedSavedMethods = layoutClass.savedMethodsLayout.displayMergedSavedMethods
6464

6565
let (getVisaCards, closeComponentIfSavedMethodsAreEmpty) = ClickToPayHook.useClickToPay(
6666
~areClickToPayUIScriptsLoaded,
@@ -279,9 +279,9 @@ let make = (~cardProps, ~expiryProps, ~cvcProps, ~paymentType: CardThemeType.mod
279279
}, [selectedOption])
280280
useSubmitPaymentData(submitCallback)
281281
React.useEffect(() => {
282-
if isMergedSavedMethodsList && selectedOption == "saved_methods" {
282+
if displayMergedSavedMethods && selectedOption == "saved_methods" {
283283
setShowPaymentMethodsScreen(_ => false)
284-
} else if isMergedSavedMethodsList {
284+
} else if displayMergedSavedMethods {
285285
setShowPaymentMethodsScreen(_ => true)
286286
}
287287
setSelectedOption(prev =>
@@ -478,7 +478,7 @@ let make = (~cardProps, ~expiryProps, ~cvcProps, ~paymentType: CardThemeType.mod
478478
<RenderIf
479479
condition={!showPaymentMethodsScreen &&
480480
(displaySavedPaymentMethods || isShowPaymentMethodsDependingOnClickToPay) &&
481-
!isMergedSavedMethodsList}>
481+
!displayMergedSavedMethods}>
482482
<SavedMethods
483483
paymentToken
484484
setPaymentToken
@@ -495,7 +495,7 @@ let make = (~cardProps, ~expiryProps, ~cvcProps, ~paymentType: CardThemeType.mod
495495
}}
496496
<RenderIf
497497
condition={(paymentOptions->Array.length > 0 || walletOptions->Array.length > 0) &&
498-
(showPaymentMethodsScreen || isMergedSavedMethodsList) &&
498+
(showPaymentMethodsScreen || displayMergedSavedMethods) &&
499499
clickToPayConfig.isReady->Option.isSome}>
500500
<div
501501
className="flex flex-col place-items-center"
@@ -532,7 +532,7 @@ let make = (~cardProps, ~expiryProps, ~cvcProps, ~paymentType: CardThemeType.mod
532532
condition={((displaySavedPaymentMethods && savedMethods->Array.length > 0) ||
533533
isShowPaymentMethodsDependingOnClickToPay) &&
534534
showPaymentMethodsScreen &&
535-
!isMergedSavedMethodsList}>
535+
!displayMergedSavedMethods}>
536536
<div
537537
className="Label flex flex-row gap-3 items-end cursor-pointer mt-4"
538538
style={
@@ -565,7 +565,7 @@ let make = (~cardProps, ~expiryProps, ~cvcProps, ~paymentType: CardThemeType.mod
565565
| _ =>
566566
<RenderIf
567567
condition={(!displaySavedPaymentMethods ||
568-
(isMergedSavedMethodsList && savedMethods->Array.length == 0)) &&
568+
(displayMergedSavedMethods && savedMethods->Array.length == 0)) &&
569569
paymentOptions->Array.length == 0 &&
570570
walletOptions->Array.length == 0}>
571571
<PaymentElementShimmer />

‎src/Types/PaymentType.res‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -103,16 +103,16 @@ type wallets = {
103103
style: style,
104104
}
105105
type business = {name: string}
106-
type mergeSavedMethods = {
106+
type savedMethodsLayout = {
107107
maxSavedItems: int,
108-
isMergedSavedMethodsList: bool,
108+
displayMergedSavedMethods: bool,
109109
}
110110
type layoutConfig = {
111111
defaultCollapsed: bool,
112112
radios: bool,
113113
spacedAccordionItems: bool,
114114
maxAccordionItems: int,
115-
mergeSavedMethods: mergeSavedMethods,
115+
savedMethodsLayout: savedMethodsLayout,
116116
\"type": layout,
117117
}
118118

@@ -254,16 +254,16 @@ let defaultCustomerMethods = {
254254
recurringEnabled: false,
255255
billing: defaultDisplayBillingDetails,
256256
}
257-
let defaultMergeSavedMethods = {
257+
let defaultSavedMethodsLayout = {
258258
maxSavedItems: 2,
259-
isMergedSavedMethodsList: false,
259+
displayMergedSavedMethods: false,
260260
}
261261
let defaultLayout = {
262262
defaultCollapsed: false,
263263
radios: false,
264264
spacedAccordionItems: false,
265265
maxAccordionItems: 4,
266-
mergeSavedMethods: defaultMergeSavedMethods,
266+
savedMethodsLayout: defaultSavedMethodsLayout,
267267
\"type": Tabs,
268268
}
269269
let defaultAddress: address = {
@@ -670,15 +670,20 @@ let getFields: (Dict.t<JSON.t>, string, 'a) => fields = (dict, str, logger) => {
670670
->Option.getOr(defaultFields)
671671
}
672672
let getMergedViewValues = (json, logger) => {
673-
let dict = json->Utils.getDictFromDict("mergeSavedMethods")
673+
let dict = json->Utils.getDictFromDict("savedMethodsLayout")
674674
unknownKeysWarning(
675-
["maxSavedItems", "isMergedSavedMethodsList"],
675+
["maxSavedItems", "displayMergedSavedMethods"],
676676
dict,
677-
"options.layout.mergedSavedMethods",
677+
"options.layout.savedMethodsLayout",
678678
)
679679
{
680680
maxSavedItems: getNumberWithWarning(dict, "maxSavedItems", 2, ~logger),
681-
isMergedSavedMethodsList: getBoolWithWarning(dict, "isMergedSavedMethodsList", false, ~logger),
681+
displayMergedSavedMethods: getBoolWithWarning(
682+
dict,
683+
"displayMergedSavedMethods",
684+
false,
685+
~logger,
686+
),
682687
}
683688
}
684689
let getLayoutValues = (val, logger) => {
@@ -694,7 +699,7 @@ let getLayoutValues = (val, logger) => {
694699
"spacedAccordionItems",
695700
"type",
696701
"maxAccordionItems",
697-
"mergeSavedMethods",
702+
"savedMethodsLayout",
698703
],
699704
json,
700705
"options.layout",
@@ -704,7 +709,7 @@ let getLayoutValues = (val, logger) => {
704709
radios: getBoolWithWarning(json, "radios", false, ~logger),
705710
spacedAccordionItems: getBoolWithWarning(json, "spacedAccordionItems", false, ~logger),
706711
maxAccordionItems: getNumberWithWarning(json, "maxAccordionItems", 4, ~logger),
707-
mergeSavedMethods: getMergedViewValues(json, logger),
712+
savedMethodsLayout: getMergedViewValues(json, logger),
708713
\"type": layoutType->getLayout,
709714
}
710715
})

‎src/Utilities/PaymentUtils.res‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ let useGetPaymentMethodList = (~paymentOptions, ~paymentType, ~sessions) => {
397397
)
398398

399399
let layoutClass = CardUtils.getLayoutClass(optionAtomValue.layout)
400-
let isMergedSavedMethodsList = layoutClass.mergeSavedMethods.isMergedSavedMethodsList
400+
let displayMergedSavedMethods = layoutClass.savedMethodsLayout.displayMergedSavedMethods
401401

402402
let processPaymentsList = (
403403
~paymentList,
@@ -436,7 +436,7 @@ let useGetPaymentMethodList = (~paymentOptions, ~paymentType, ~sessions) => {
436436
}
437437

438438
let showSavedPaymentMethodsTab =
439-
isMergedSavedMethodsList &&
439+
displayMergedSavedMethods &&
440440
filteredSaved->Array.length != 0 &&
441441
optionAtomValue.displaySavedPaymentMethods
442442

@@ -484,7 +484,7 @@ let useGetPaymentMethodList = (~paymentOptions, ~paymentType, ~sessions) => {
484484
}
485485

486486
React.useMemo(() => {
487-
switch (methodslist, optionAtomValue.customerPaymentMethods, isMergedSavedMethodsList) {
487+
switch (methodslist, optionAtomValue.customerPaymentMethods, displayMergedSavedMethods) {
488488
| (Loaded(paymentlist), _, false)
489489
| (Loaded(paymentlist), NoResult(_), _) =>
490490
processPaymentsList(~paymentList=paymentlist, ~savedPaymentMethods=None)
@@ -507,7 +507,7 @@ let useGetPaymentMethodList = (~paymentOptions, ~paymentType, ~sessions) => {
507507
isGooglePayReady,
508508
optionAtomValue.customerPaymentMethods,
509509
optionAtomValue.displaySavedPaymentMethods,
510-
isMergedSavedMethodsList,
510+
displayMergedSavedMethods,
511511
))
512512
}
513513

0 commit comments

Comments
 (0)