ref: Reactor register/pricing/discounts #874
Conversation
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
fricoben
changed the title
fricoben
added
the
🚧 In progress do not merge
WalkthroughThe changes across the codebase involve renaming properties for clarity, particularly changing Changes
Sequence Diagram(s)sequenceDiagram
participant A as User
participant B as Currency Management Hook
participant C as Token Quote Service
A->>B: Select currency
B->>C: Fetch token quote
C-->>B: Return quote data
B-->>A: Display quote
This diagram illustrates the interaction between the user and the new currency management hook, highlighting the process of selecting a currency and fetching the corresponding token quote. Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
fricoben
force-pushed
the
ref/register-refactoring
branch
from
402044f to
6761df4
Compare
fricoben
force-pushed
the
ref/register-refactoring
branch
from
8bd47a9 to
2d21988
Compare
fricoben
force-pushed
the
ref/register-refactoring
branch
from
2d21988 to
734be12
Compare
fricoben
added
🍒 Nice to have
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 3
Outside diff range, codebase verification and nitpick comments (1)
context/FormProvider.tsx (1)
Line range hint
64-73: Fix the inconsistency inclearForm.The
durationshould be renamed todurationInYearsto match the updatedFormStatetype.Apply this diff to fix the inconsistency:
def clearForm = useCallback(() => { setFormState((prevState) => ({ ...prevState, selectedDomains: {}, tokenId: 0, - duration: 1, + durationInYears: 1, isUpselled: false, selectedPfp: undefined, })); }, []);
Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Files selected for processing (36)
- components/discount/freeRegisterCheckout.tsx (4 hunks)
- components/discount/freeRegisterSummary.tsx (2 hunks)
- components/discount/freeRenewalCheckout.tsx (11 hunks)
- components/discount/registerDiscount.tsx (10 hunks)
- components/domains/autorenewal.tsx (11 hunks)
- components/domains/registerCheckboxes.tsx (3 hunks)
- components/domains/registerSummary.tsx (6 hunks)
- components/domains/registerV3.tsx (1 hunks)
- components/domains/renewalV2.tsx (1 hunks)
- components/domains/steps/checkoutCard.tsx (32 hunks)
- components/domains/steps/reduceDuration.tsx (2 hunks)
- components/domains/steps/userInfoForm.tsx (4 hunks)
- components/identities/actions/clickable/clickablePersonhoodIcon.tsx (1 hunks)
- context/FormProvider.tsx (8 hunks)
- hooks/useAllowanceCheck.tsx (2 hunks)
- hooks/useNeedAllowances.tsx (2 hunks)
- hooks/useNeedSubscription.tsx (2 hunks)
- pages/argent.tsx (1 hunks)
- pages/freerenewal.tsx (2 hunks)
- pages/gift.tsx (1 hunks)
- pages/quantumleap.tsx (1 hunks)
- tests/utils/altcoinService.test.js (4 hunks)
- tests/utils/feltService.test.js (5 hunks)
- tests/utils/priceService.test.js (3 hunks)
- tests/utils/subscriptionService.test.js (1 hunks)
- types/frontTypes.d.ts (3 hunks)
- utils/altcoinService.ts (6 hunks)
- utils/callData/autoRenewalCalls.ts (1 hunks)
- utils/callData/registrationCalls.ts (8 hunks)
- utils/constants.ts (1 hunks)
- utils/discounts/evergreen.ts (2 hunks)
- utils/discounts/freeRegistration.ts (1 hunks)
- utils/discounts/freeRenewal.ts (1 hunks)
- utils/feltService.ts (1 hunks)
- utils/priceService.ts (3 hunks)
- utils/subscriptionService.ts (1 hunks)
Files skipped from review due to trivial changes (6)
- components/domains/renewalV2.tsx
- components/identities/actions/clickable/clickablePersonhoodIcon.tsx
- pages/argent.tsx
- pages/freerenewal.tsx
- pages/quantumleap.tsx
- tests/utils/subscriptionService.test.js
Additional context used
Biome
utils/feltService.ts
[error] 30-30: isNaN is unsafe. It attempts a type coercion. Use Number.isNaN instead.
See the MDN documentation for more details.
Unsafe fix: Use Number.isNaN instead.(lint/suspicious/noGlobalIsNan)
Additional comments not posted (126)
utils/subscriptionService.ts (2)
Line range hint
3-9: LGTM!The function is correctly implemented.
The code changes are approved.
Line range hint
11-14: LGTM!The function is correctly implemented.
The code changes are approved.
utils/discounts/freeRenewal.ts (2)
16-16: LGTM!Renaming
durationtodurationInDaysimproves clarity regarding the unit of measurement.The code changes are approved.
19-19: LGTM!Changing
pricefrom a string toBigIntimproves precision in financial calculations.The code changes are approved.
utils/discounts/freeRegistration.ts (2)
16-16: LGTM!Renaming
durationtodurationInDaysimproves clarity regarding the unit of measurement.The code changes are approved.
18-18: LGTM!Changing
pricefrom a string toBigIntimproves precision in financial calculations.The code changes are approved.
utils/discounts/evergreen.ts (2)
2-4: LGTM!The changes to the duration properties improve clarity by explicitly indicating that durations are in days.
The code changes are approved.
15-17: LGTM!The changes to the duration properties improve clarity by explicitly indicating that durations are in days.
The code changes are approved.
utils/callData/autoRenewalCalls.ts (2)
6-11: LGTM!The changes improve type safety and simplify the logic by eliminating unnecessary conversions.
The code changes are approved.
18-26: LGTM!The changes improve type safety and simplify the logic by eliminating unnecessary conversions.
The code changes are approved.
hooks/useAllowanceCheck.tsx (1)
Line range hint
15-44: LGTM!The changes improve the functionality of the hook by providing more comprehensive information about the allowance status.
The code changes are approved.
components/domains/steps/reduceDuration.tsx (2)
9-9: LGTM!The change aligns with the new terminology and enhances clarity.
The code changes are approved.
20-20: LGTM!The change ensures consistency with the updated prop type.
The code changes are approved.
components/discount/freeRegisterSummary.tsx (3)
3-3: LGTM!The import is necessary for the updated yearly price calculation.
The code changes are approved.
8-8: LGTM!The change aligns with the new terminology and enhances clarity.
The code changes are approved.
Line range hint
14-31: LGTM!The changes ensure that the displayed message and price are accurate and user-friendly.
The code changes are approved.
pages/gift.tsx (1)
46-46: LGTM! But verify the consistency of the new property name.The change enhances clarity by specifying the unit of measurement for the duration. Ensure that the new property name
durationInDaysis consistent with the rest of the codebase.The code changes are approved.
Run the following script to verify the consistency of the new property name:
Verification successful
Property Name Consistency Verified
The property name
durationInDayshas been consistently applied across the codebase, and there are no remaining instances of the old property nameduration. This confirms that the update has been correctly implemented.
- Instances of
durationInDayswere found, confirming its usage.Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash # Description: Verify the consistency of the new property name `durationInDays`. # Test: Search for the old property name. Expect: No occurrences of the old property name. rg --type js --type ts --type tsx -w 'duration=' # Test: Search for the new property name. Expect: Only occurrences of the new property name. rg --type js --type ts --type tsx -w 'durationInDays='Length of output: 159
Script:
#!/bin/bash # Description: Verify the consistency of the new property name `durationInDays`. # Find all .js, .ts, and .tsx files and search for the old and new property names. fd -e js -e ts -e tsx -x rg -w 'duration=' {} fd -e js -e ts -e tsx -x rg -w 'durationInDays=' {}Length of output: 212
utils/feltService.ts (1)
41-49: LGTM!The changes improve type safety and streamline the function by reducing unnecessary type checks and conversions.
The code changes are approved.
components/domains/registerV3.tsx (1)
37-37: LGTM! But verify the consistency of the new property name.The change enhances clarity by specifying the unit of measurement for the duration. Ensure that the new property name
durationInYearsis consistent with the rest of the codebase.The code changes are approved.
Run the following script to verify the consistency of the new property name:
Verification successful
The new property name
durationInYearsis consistently used across the codebase.The old property name
durationis no longer present, anddurationInYearsis correctly used in several files, indicating that the change has been applied consistently.
components/domains/steps/checkoutCard.tsxcomponents/discount/freeRenewalCheckout.tsxcomponents/discount/registerDiscount.tsxScripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash # Description: Verify the consistency of the new property name `durationInYears`. # Test: Search for the old property name. Expect: No occurrences of the old property name. rg --type js --type ts --type tsx -w 'duration=' # Test: Search for the new property name. Expect: Only occurrences of the new property name. rg --type js --type ts --type tsx -w 'durationInYears='Length of output: 160
Script:
#!/bin/bash # Description: Verify the consistency of the new property name `durationInYears`. # Test: Search for the old property name. Expect: No occurrences of the old property name. rg --type js --type ts --type jsx -w 'duration=' # Test: Search for the new property name. Expect: Only occurrences of the new property name. rg --type js --type ts --type jsx -w 'durationInYears='Length of output: 160
Script:
#!/bin/bash # Description: Verify the consistency of the new property name `durationInYears`. # Test: Search for the old property name. Expect: No occurrences of the old property name. rg --type js --type ts -w 'duration=' # Test: Search for the new property name. Expect: Only occurrences of the new property name. rg --type js --type ts -w 'durationInYears='Length of output: 347
components/domains/registerCheckboxes.tsx (3)
4-4: LGTM!The import statement for
weiToEthis correctly added.The code changes are approved.
20-20: LGTM!The type definition for
maxPriceRangeis correctly changed fromstringtobigint.The code changes are approved.
40-43: LGTM!The function
getHelperTextis correctly updated to useweiToEthinstead ofgweiToEth.The code changes are approved.
hooks/useNeedAllowances.tsx (3)
10-10: LGTM!The import statement for
isApprovalInfiniteis correctly added.The code changes are approved.
15-20: LGTM!The initial state for
needsAllowancesis correctly updated to includecurrentAllowance.The code changes are approved.
82-85: LGTM!The state update for
needsAllowancesis correctly modified to merge the previous allowances with the new allowances.The code changes are approved.
utils/priceService.ts (9)
1-1: LGTM!The import statement for
weiToEthis correctly added.The code changes are approved.
2-2: LGTM!The import statement for
selectedDomainsToArrayis correctly added.The code changes are approved.
12-19: LGTM!The function
getDomainPriceWeiis correctly renamed and updated to enhance clarity regarding the expected input.The code changes are approved.
37-45: LGTM!The function
getManyDomainsPriceWeiis correctly renamed and updated to accept aRecord<string, boolean> | undefinedinstead of an array of strings.The code changes are approved.
58-61: LGTM!The function
getYearlyPriceWeiis correctly renamed and updated to return a value in Wei.The code changes are approved.
66-72: LGTM!The function
getTotalYearlyPriceis correctly updated to handle selected domains in a more flexible manner.The code changes are approved.
74-76: LGTM!The function
getDisplayablePriceis correctly added to convert a price in Wei to a formatted string.The code changes are approved.
78-89: LGTM!The function
getApprovalAmountis correctly added to calculate the amount to approve based on various parameters.The code changes are approved.
91-103: LGTM!The function
isApprovalInfiniteis correctly added to determine if a given approval amount is infinite based on defined thresholds.The code changes are approved.
context/FormProvider.tsx (3)
11-11: LGTM!The renaming of
durationtodurationInYearsimproves clarity.The code changes are approved.
37-37: LGTM!The renaming of
durationtodurationInYearsininitialStateensures consistency with the updatedFormStatetype.The code changes are approved.
60-62: LGTM!The refactoring to use
useCallbackimproves performance by memoizing the function.The code changes are approved.
types/frontTypes.d.ts (3)
54-57: LGTM!The renaming of
durationtodurationInDaysimproves clarity, and changingpricefromstringtobigintensures appropriate handling of large numerical values.The code changes are approved.
129-130: LGTM!Replacing the boolean type with
AllowanceStatusenhances the structure and clarity of the allowance-related data.The code changes are approved.
149-151: LGTM!The renaming of
duration,paidDuration, andmaxDurationtodurationInDays,paidDurationInDays, andmaxDurationInDaysimproves clarity.The code changes are approved.
tests/utils/feltService.test.js (6)
49-51: LGTM!The new test case improves coverage by testing the conversion of a number to its hex representation.
The code changes are approved.
55-57: LGTM!The new test case improves coverage by testing the conversion of 0 to its hex representation.
The code changes are approved.
75-78: LGTM!The renaming of
gweiToEthtoweiToEthimproves clarity by specifying the unit of the input value. The updated test cases reflect this change appropriately.The code changes are approved.
88-107: LGTM!The updated test cases enhance type safety and ensure that the function handles large integers appropriately.
The code changes are approved.
115-136: LGTM!The reformatting of test cases improves readability without altering the underlying logic.
The code changes are approved.
Line range hint
152-168: LGTM!The updated test cases improve coverage by testing edge cases and ensuring that the function handles invalid inputs appropriately.
The code changes are approved.
utils/callData/registrationCalls.ts (6)
4-12: LGTM!The change from
stringtobigintfor thepriceparameter is appropriate and the conversion to a string for thecalldatais correctly implemented.The code changes are approved.
Line range hint
20-33: LGTM!The change from
durationInYearstodurationInDayssimplifies the logic and the use ofnumberToStringensures accurate representation in thecalldata.The code changes are approved.
Line range hint
50-65: LGTM!The change from
durationInYearstodurationInDayssimplifies the logic and the use ofnumberToStringensures accurate representation in thecalldata.The code changes are approved.
103-111: LGTM!The change from
stringtobigintfor theamountparameter is appropriate and the conversion to a string for thecalldatais correctly implemented.The code changes are approved.
Line range hint
117-127: LGTM!The change from
durationInYearstodurationInDayssimplifies the logic and the direct inclusion in thecalldataensures accurate representation.The code changes are approved.
Line range hint
137-149: LGTM!The change from
durationInYearstodurationInDayssimplifies the logic and the direct inclusion in thecalldataensures accurate representation.The code changes are approved.
utils/constants.ts (1)
8-8: LGTM!The change in the
swissVatRateconstant reflects the updated VAT rate and is correctly implemented.The code changes are approved.
components/domains/registerSummary.tsx (8)
8-14: LGTM!The imports are correctly updated to include necessary utilities and components.
The code changes are approved.
Line range hint
17-33: LGTM!The updates to the
RegisterSummaryPropstype to usebigintfor price properties and renamingdurationtodurationInYearsimprove clarity and precision.The code changes are approved.
Line range hint
37-51: LGTM!The updates to the
RegisterSummarycomponent's props and internal logic to accommodate the new types and improve state management are well-implemented.The code changes are approved.
53-64: LGTM!The use of
useStateanduseEffecthooks to manage and fetch the ETH to USD price is correctly implemented.The code changes are approved.
75-101: LGTM!The logic for calculating the USD registration price and sales tax amount using the new
computeUsdRegistrationPriceandcomputeUsdSalesTaxAmountfunctions is clear and well-structured.The code changes are approved.
138-148: LGTM!The
displayTokenPricefunction correctly handles the display of prices, including sales tax information for Swiss residents.The code changes are approved.
151-157: LGTM!The
getCheckoutMessagefunction correctly formats the checkout message based on the new price properties and duration.The code changes are approved.
166-174: LGTM!The rendering logic for the
RegisterSummarycomponent, including the conditional display of the USD price, is well-implemented.The code changes are approved.
components/domains/steps/userInfoForm.tsx (4)
66-66: LGTM!The function
changeDurationcorrectly updates the form state withdurationInYears.The code changes are approved.
84-85: LGTM!The function
updateFormStatecorrectly updates the form state withdurationInYears.The code changes are approved.
Tools
Biome
[error] 85-85: Unnecessary use of boolean literals in conditional expression.
Simplify your code by directly assigning the result without using a ternary operator.
If your goal is negation, you may use the logical NOT (!) or double NOT (!!) operator for clearer and concise code.
Check for more details about NOT operator.
Unsafe fix: Remove the conditional expression with(lint/complexity/noUselessTernary)
111-112: LGTM!The function
isDisabledcorrectly checks the conditions usingdurationInYears.The code changes are approved.
157-157: LGTM!The
NumberTextFieldcomponent correctly reflects the new property namedurationInYears.The code changes are approved.
utils/altcoinService.ts (9)
18-29: LGTM!The function
getDomainPriceAltcoincorrectly handles the conversion and calculation usingbigint.The code changes are approved.
35-47: LGTM!The function
getPriceForDurationcorrectly handles the conversion and calculation usingbigint.The code changes are approved.
98-107: LGTM!The function
getDomainPricecorrectly handles the conversion and calculation usingbigint.The code changes are approved.
112-120: LGTM!The function
getYearlyPricecorrectly calculates the yearly price usingbigint.The code changes are approved.
122-136: LGTM!The function
getManyDomainsPricecorrectly calculates the price for multiple domains usingbigint.The code changes are approved.
138-148: LGTM!The function
getTotalYearlyPricecorrectly calculates the total yearly price for multiple domains usingbigint.The code changes are approved.
155-160: LGTM!The function
getAutoRenewAllowancecorrectly handles the conversion and calculation usingbigint.The code changes are approved.
Line range hint
181-208: LGTM!The function
smartCurrencyChoosingcorrectly handles the conversion and calculation usingbigint.The code changes are approved.
3-3: LGTM!The import statement correctly includes
getDomainPriceWei.The code changes are approved.
components/discount/freeRegisterCheckout.tsx (2)
36-36: LGTM!The function
FreeRegisterCheckoutcorrectly reflects the new property namedurationInDays.The code changes are approved.
201-204: LGTM!The
FreeRegisterSummarycomponent correctly reflects the new property namedurationInDays.The code changes are approved.
tests/utils/priceService.test.js (7)
5-6: LGTM!The function
getDomainPriceWeiis correctly tested with various domain names and expected prices.The code changes are approved.
Also applies to: 17-43
6-7: LGTM!The function
getManyDomainsPriceWeiis correctly tested with various sets of domains and durations.The code changes are approved.
Also applies to: 47-81
9-10: LGTM!The function
getTotalYearlyPriceis correctly tested with various sets of selected domains.The code changes are approved.
Also applies to: 135-152
10-11: LGTM!The function
getYearlyPriceWeiis correctly tested with various domain names and expected prices.The code changes are approved.
Also applies to: 156-172
11-12: LGTM!The function
getApprovalAmountis correctly tested with various sets of inputs.The code changes are approved.
Also applies to: 175-226
12-13: LGTM!The function
getDisplayablePriceis correctly tested with various price values.The code changes are approved.
Also applies to: 229-253
13-14: LGTM!The function
isApprovalInfiniteis correctly tested with various values.The code changes are approved.
Also applies to: 256-289
tests/utils/altcoinService.test.js (8)
25-33: LGTM!The function
getDomainPriceAltcoinis correctly tested with various price and quote values.The code changes are approved.
Also applies to: 37-42, 47-52
Line range hint
59-59: LGTM!The function
getLimitPriceRangeis correctly tested with various currency types and price values.The code changes are approved.
Line range hint
59-59: LGTM!The function
getRenewalPriceETHis correctly tested with various price data and duration values.The code changes are approved.
140-152: LGTM!The function
getDomainPriceis correctly tested with various domain names and currency types.The code changes are approved.
Line range hint
161-187: LGTM!The function
getAutoRenewAllowanceis correctly tested with various currency types, sales tax rates, and domain prices.The code changes are approved.
193-217: LGTM!The function
getPriceForDurationis correctly tested with various price and duration values.The code changes are approved.
193-217: LGTM!The function
fetchAvnuQuoteDatais correctly tested with various fetch scenarios.The code changes are approved.
193-217: LGTM!The function
smartCurrencyChoosingis correctly tested with various token balances and domain prices.The code changes are approved.
components/domains/autorenewal.tsx (11)
60-63: Update state management for monetary values.The state variables
salesTaxAmount,priceInEth, andpricehave been updated to usebigintfor enhanced precision in financial calculations.The code changes are approved.
84-84: RenameneedsAllowancetoallowanceStatus.The variable
needsAllowancehas been renamed toallowanceStatusto reflect a clearer understanding of its purpose.The code changes are approved.
193-199: Add logic for handling token quotes.The logic for setting
quoteDataand handling errors has been added to provide user feedback regarding token quotes.The code changes are approved.
232-233: Update price calculation logic.The logic for updating
priceInEthhas been updated to usegetTotalYearlyPrice.The code changes are approved.
257-257: Update sales tax calculation logic.The logic for setting
salesTaxAmounthas been updated to usebigintandapplyRateToBigInt.The code changes are approved.
273-285: Update approval amount calculation logic.The logic for calculating
amountToApprovehas been updated to usegetApprovalAmount.The code changes are approved.
326-326: Update dependencies foruseEffect.The dependencies for the
useEffecthook have been updated to includeallowanceStatus.The code changes are approved.
434-439: AddNotificationcomponent for currency errors.The
Notificationcomponent has been added to provide user feedback regarding currency errors.The code changes are approved.
49-49: Add import forNotificationcomponent.The
Notificationcomponent is imported to provide user feedback. Ensure the component is correctly implemented in../UI/notification.Run the following script to verify the component definition:
Verification successful
Notification Component is Correctly Defined
The
Notificationcomponent is correctly defined in thecomponents/UI/notification.tsxfile as aFunctionComponent. This confirms that the import statement incomponents/domains/autorenewal.tsxis valid and correctly implemented.
- Location of Definition:
components/UI/notification.tsxScripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash # Description: Verify the component definition for `Notification`. # Test: Search for the component definition. Expect: Only occurrences of the new component definition. rg --type javascript -A 5 $'const Notification'Length of output: 83
Script:
#!/bin/bash # Description: Verify the component definition for `Notification`. # Test: Search for the component definition. Expect: Only occurrences of the new component definition. rg --type js -A 5 $'const Notification'Length of output: 40
Script:
#!/bin/bash # Description: Verify the component definition for `Notification` in various file types and patterns. # Test: Search for the component definition using different patterns and file types. rg --type-add 'jsx:*.{jsx,tsx}' --type jsx -A 5 $'(const|function|class) Notification'Length of output: 407
19-20: Update imports forgetApprovalAmountandgetTotalYearlyPrice.The imports have been updated to reflect the new functions. Ensure these functions are correctly implemented in
../../utils/priceService.Run the following script to verify the function definitions:
Verification successful
Function Implementations Verified for
getApprovalAmountandgetTotalYearlyPrice.The functions are correctly implemented in
utils/priceService.ts. Ensure that the imports incomponents/domains/autorenewal.tsxare from this file.
getApprovalAmountis defined inutils/priceService.ts.getTotalYearlyPriceis defined inutils/priceService.tsandutils/altcoinService.ts.Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash # Description: Verify the function definitions for `getApprovalAmount` and `getTotalYearlyPrice`. # Test: Search for the function definitions. Expect: Only occurrences of the new function definitions. rg --type python -A 5 $'def getApprovalAmount' rg --type python -A 5 $'def getTotalYearlyPrice'Length of output: 159
Script:
#!/bin/bash # Description: Verify the function definitions for `getApprovalAmount` and `getTotalYearlyPrice` in TypeScript files. # Test: Search for the function definitions. Expect: Only occurrences of the new function definitions. rg --type typescript -A 5 $'function getApprovalAmount' rg --type typescript -A 5 $'function getTotalYearlyPrice'Length of output: 185
Script:
#!/bin/bash # Description: Verify the function definitions for `getApprovalAmount` and `getTotalYearlyPrice` in .ts files. # Test: Search for the function definitions. Expect: Only occurrences of the new function definitions. rg -t ts -A 5 $'function getApprovalAmount' rg -t ts -A 5 $'function getTotalYearlyPrice'Length of output: 1054
46-46: Update import foruseNeedAllowances.The import has been updated to reflect the new hook name. Ensure the hook is correctly implemented in
@/hooks/useNeedAllowances.Run the following script to verify the hook definition:
components/discount/freeRenewalCheckout.tsx (8)
55-55: Consolidate props intoofferobject.The props have been consolidated into a single
offerobject of typeDiscount, simplifying the component's interface.The code changes are approved.
67-67: Update state management forsalesTaxAmount.The state variable
salesTaxAmounthas been updated to usebigintfor enhanced precision in financial calculations.The code changes are approved.
79-81: Update state management forpotentialPrice.The state variable
potentialPricehas been updated to usebigintfor enhanced precision in financial calculations.The code changes are approved.
237-242: Update sales tax calculation logic.The logic for setting
salesTaxAmounthas been updated to usebigintandapplyRateToBigInt.The code changes are approved.
263-275: Update approval amount calculation logic.The logic for calculating
amountToApprovehas been updated to usegetApprovalAmount.The code changes are approved.
399-399: Update prop forRegisterSummary.The prop
priceInEthhas been updated to usepotentialPrice.The code changes are approved.
47-47: Update import forgetTotalYearlyPrice.The import has been updated to reflect the new function name. Ensure the function is correctly implemented in
../../utils/altcoinService.Run the following script to verify the function definition:
21-22: Update imports forgetApprovalAmountandgetDisplayablePrice.The imports have been updated to reflect the new functions. Ensure these functions are correctly implemented in
../../utils/priceService.Run the following script to verify the function definitions:
Verification successful
Verification Successful: Imports and Function Definitions are Correct
The functions
getApprovalAmountandgetDisplayablePriceare correctly defined inutils/priceService.tsand properly imported infreeRenewalCheckout.tsx. No issues were found with the imports or the function definitions.
getApprovalAmountis defined and exported inutils/priceService.ts.getDisplayablePriceis defined and exported inutils/priceService.ts.Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash # Description: Verify the function definitions for `getApprovalAmount` and `getDisplayablePrice`. # Test: Search for the function definitions. Expect: Only occurrences of the new function definitions. rg --type python -A 5 $'def getApprovalAmount' rg --type python -A 5 $'def getDisplayablePrice'Length of output: 159
Script:
#!/bin/bash # Description: Verify the function definitions for `getApprovalAmount` and `getDisplayablePrice` in TypeScript files. # Test: Search for the function definitions in TypeScript files. ast-grep --lang typescript --pattern 'function getApprovalAmount($_) { $$$ }' ast-grep --lang typescript --pattern 'function getDisplayablePrice($_) { $$$ }'Length of output: 161
Script:
#!/bin/bash # Description: Search for the function names `getApprovalAmount` and `getDisplayablePrice` in TypeScript files to capture different declaration styles. # Test: Search for the function names in TypeScript files. rg 'getApprovalAmount' --type ts -A 3 rg 'getDisplayablePrice' --type ts -A 3Length of output: 5041
components/domains/steps/checkoutCard.tsx (16)
78-84: Update state management for monetary values.The state variables
dailyPriceInEth,discountedPriceInEth,price,discountedPrice, andmaxPriceRangehave been updated to usebigintfor enhanced precision in financial calculations.The code changes are approved.
87-87: Update state management forsalesTaxAmount.The state variable
salesTaxAmounthas been updated to usebigintfor enhanced precision in financial calculations.The code changes are approved.
116-116: Add state management forcurrencyError.The state variable
currencyErrorhas been added to handle errors related to currency fetching.The code changes are approved.
125-134: Add logic for handling token quotes.The logic for setting
quoteDataand handling errors has been added to provide user feedback regarding token quotes.The code changes are approved.
168-176: Update price calculation logic.The logic for updating
dailyPriceInEthanddiscountedPriceInEthhas been updated to usegetManyDomainsPriceWei.The code changes are approved.
179-193: Update discounted price calculation logic.The logic for updating
discountedPricehas been updated to usebigintandgetDomainPriceAltcoin.The code changes are approved.
Line range hint
237-277: Update sales tax calculation logic.The logic for setting
salesTaxAmounthas been updated to usebigintandapplyRateToBigInt.The code changes are approved.
Line range hint
292-307: Update price calculation logic.The logic for updating
pricehas been updated to usegetManyDomainsPriceWeiandgetDomainPriceAltcoin.The code changes are approved.
322-322: Update dependencies foruseEffect.The dependencies for the
useEffecthook have been updated to includeallowanceStatus.The code changes are approved.
434-445: Update approval amount calculation logic.The logic for calculating
amountToApprovehas been updated to usegetApprovalAmount.The code changes are approved.
569-578: Update approval amount calculation logic.The logic for calculating
amountToApprovehas been updated to usegetApprovalAmount.The code changes are approved.
Line range hint
794-807: AddReduceDurationcomponent for handling reduced duration.The
ReduceDurationcomponent has been added to handle cases where the user's balance is insufficient for the selected duration.The code changes are approved.
Line range hint
819-836: Update prop forRegisterSummary.The props
priceInEth,price,durationInYears,discountedPrice, anddiscountedPriceInEthhave been updated to use the new state variables.The code changes are approved.
880-885: AddNotificationcomponent for currency errors.The
Notificationcomponent has been added to provide user feedback regarding currency errors.The code changes are approved.
62-62: Add import forNotificationcomponent.The
Notificationcomponent is imported to provide user feedback. Ensure the component is correctly implemented in../UI/notification.Run the following script to verify the component definition:
Verification successful
Notification component is correctly implemented and imported.
The
Notificationcomponent is defined incomponents/UI/notification.tsxas expected. The import statement incheckoutCard.tsxshould function correctly. No further action is required.Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash # Description: Verify the component definition for `Notification`. # Test: Search for the component definition. Expect: Only occurrences of the new component definition. rg --type javascript -A 5 $'const Notification'Length of output: 83
Script:
#!/bin/bash # Description: Verify the component definition for `Notification`. # Test: Search for the component definition. Expect: Only occurrences of the new component definition. rg --type typescript -A 5 $'const Notification'Length of output: 83
Script:
#!/bin/bash # Description: Verify the component definition for `Notification`. # Test: Search for the component definition. Expect: Only occurrences of the new component definition. rg -A 5 $'const Notification'Length of output: 350
33-39: Update imports for pricing functions.The imports have been updated to reflect the new functions. Ensure these functions are correctly implemented in
@/utils/altcoinServiceand@/utils/priceService.Run the following script to verify the function definitions:
Verification successful
Functions Verified in Updated Imports
The functions
getYearlyPrice,smartCurrencyChoosing,getApprovalAmount, andgetManyDomainsPriceWeiare correctly implemented in the respective filesaltcoinService.tsandpriceService.ts. The search results confirm their presence and correct implementation.
- Verified Functions:
getYearlyPriceinutils/altcoinService.tsandutils/priceService.tssmartCurrencyChoosinginutils/altcoinService.tsgetApprovalAmountinutils/priceService.tsgetManyDomainsPriceWeiinutils/priceService.tsThese functions are correctly imported and implemented, aligning with the changes in the
checkoutCard.tsxfile.Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash # Description: Verify the function definitions for `getAutoRenewAllowance`, `getDomainPriceAltcoin`, `getPriceForDuration`, `getTokenQuote`, `getYearlyPrice`, `smartCurrencyChoosing`, `getApprovalAmount`, and `getManyDomainsPriceWei`. # Test: Search for the function definitions. Expect: Only occurrences of the new function definitions. rg --type python -A 5 $'def getAutoRenewAllowance' rg --type python -A 5 $'def getDomainPriceAltcoin' rg --type python -A 5 $'def getPriceForDuration' rg --type python -A 5 $'def getTokenQuote' rg --type python -A 5 $'def getYearlyPrice' rg --type python -A 5 $'def smartCurrencyChoosing' rg --type python -A 5 $'def getApprovalAmount' rg --type python -A 5 $'def getManyDomainsPriceWei'Length of output: 643
Script:
#!/bin/bash # Description: Verify the function definitions for `getAutoRenewAllowance`, `getDomainPriceAltcoin`, `getPriceForDuration`, `getTokenQuote`, `getYearlyPrice`, `smartCurrencyChoosing`, `getApprovalAmount`, and `getManyDomainsPriceWei`. # Test: Search for the function definitions. Expect: Only occurrences of the new function definitions. rg --type js -A 5 $'function getAutoRenewAllowance' rg --type js -A 5 $'function getDomainPriceAltcoin' rg --type js -A 5 $'function getPriceForDuration' rg --type js -A 5 $'function getTokenQuote' rg --type js -A 5 $'function getYearlyPrice' rg --type js -A 5 $'function smartCurrencyChoosing' rg --type js -A 5 $'function getApprovalAmount' rg --type js -A 5 $'function getManyDomainsPriceWei'Length of output: 403
Script:
#!/bin/bash # Description: Verify the function definitions for various formats in JavaScript/TypeScript files. # Test: Search for the function definitions, including arrow functions and exports. rg --type js --type ts -A 5 $'const getAutoRenewAllowance =' rg --type js --type ts -A 5 $'const getDomainPriceAltcoin =' rg --type js --type ts -A 5 $'const getPriceForDuration =' rg --type js --type ts -A 5 $'const getTokenQuote =' rg --type js --type ts -A 5 $'const getYearlyPrice =' rg --type js --type ts -A 5 $'const smartCurrencyChoosing =' rg --type js --type ts -A 5 $'const getApprovalAmount =' rg --type js --type ts -A 5 $'const getManyDomainsPriceWei =' rg --type js --type ts -A 5 $'export function getAutoRenewAllowance' rg --type js --type ts -A 5 $'export function getDomainPriceAltcoin' rg --type js --type ts -A 5 $'export function getPriceForDuration' rg --type js --type ts -A 5 $'export function getTokenQuote' rg --type js --type ts -A 5 $'export function getYearlyPrice' rg --type js --type ts -A 5 $'export function smartCurrencyChoosing' rg --type js --type ts -A 5 $'export function getApprovalAmount' rg --type js --type ts -A 5 $'export function getManyDomainsPriceWei'Length of output: 4026
| if ( | ||
| erc20AllowanceError || | ||
| (erc20AllowanceRes && | ||
| erc20AllowanceRes["remaining"].low !== UINT_128_MAX && | ||
| erc20AllowanceRes["remaining"].high !== UINT_128_MAX) | ||
| ) { | ||
| setNeedsAllowance(true); | ||
| setCurrentAllowance(BigInt(erc20AllowanceRes["remaining"].low)); |
There was a problem hiding this comment.
Ici après 10 secondes sur la page d'achat de domaine j'ai TypeError: Cannot read properties of undefined (reading 'remaining').
Selon moi cela provient du fait que erc20AllowanceRes n'est pas forcément définit vu que la condition est justement erc20AllowanceError || ....
Je pense que le mieux est de mettre:
if (erc20AllowanceRes) setCurrentAllowance(BigInt(erc20AllowanceRes["remaining"].low));There was a problem hiding this comment.
Si tu check tu as bien erc20AllowanceRes dans les conditions.
if (
erc20AllowanceError ||
(erc20AllowanceRes &&
erc20AllowanceRes["remaining"].low !== UINT_128_MAX &&
erc20AllowanceRes["remaining"].high !== UINT_128_MAX)
)
```There was a problem hiding this comment.
Sauf si erc20AllowanceError est vrai justemebt
There was a problem hiding this comment.
Et c’est spécifiquement quand erc20AllowanceError est vrai que erc20AllowanceRes est indéfini et que cela engendre une erreur
Marchand-Nicolas
added
❌ Change request
fricoben
added
🔥 Ready for review
There was a problem hiding this comment.
Actionable comments posted: 16
Outside diff range, codebase verification and nitpick comments (2)
utils/subscriptionService.ts (1)
18-32: Simplification of Subscription Data ProcessingThe
processSubscriptionDatafunction has been simplified to focus solely on Ethereum subscriptions. This change streamlines the function by removing the need to iterate through various currency types and simplifies the logic significantly.While this simplification may improve performance and maintainability, it's important to consider the impact on users with altcoin subscriptions. If the system previously supported multiple subscription types, ensure that this change aligns with strategic goals and does not inadvertently exclude important functionalities.
Consider adding additional checks or fallbacks for altcoin subscriptions if they are still relevant to the business model.
components/domains/steps/checkoutCard.tsx (1)
Line range hint
151-223: Complex but necessary useEffect for handling transaction effects.This
useEffecthandles the effects of transactions effectively, including tracking analytics events, registering metadata, and managing email subscriptions. The use of external API calls and analytics tracking is well-implemented. Consider adding error handling for the API calls to manage potential failures gracefully and ensure the user is informed of any issues.Add error handling for the external API calls used in this useEffect to enhance robustness and ensure the user is informed of any issues.
Tools
Biome
[error] 213-213: Unnecessary use of boolean literals in conditional expression.
Simplify your code by directly assigning the result without using a ternary operator.
If your goal is negation, you may use the logical NOT (!) or double NOT (!!) operator for clearer and concise code.
Check for more details about NOT operator.
Unsafe fix: Remove the conditional expression with(lint/complexity/noUselessTernary)
Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Files selected for processing (13)
- components/discount/freeRenewalCheckout.tsx (12 hunks)
- components/domains/steps/checkoutCard.tsx (10 hunks)
- context/FormProvider.tsx (7 hunks)
- hooks/checkout/useCheckoutState.tsx (1 hunks)
- hooks/checkout/useCurrencyManagement.tsx (1 hunks)
- hooks/checkout/usePriceManagement.tsx (1 hunks)
- hooks/checkout/useRegisterTxPrep.tsx (1 hunks)
- hooks/checkout/useRenewalTxPrep.tsx (1 hunks)
- hooks/useNeedAllowances.tsx (2 hunks)
- pages/argent.tsx (1 hunks)
- tests/utils/subscriptionService.test.js (2 hunks)
- utils/feltService.ts (1 hunks)
- utils/subscriptionService.ts (2 hunks)
Files skipped from review as they are similar to previous changes (2)
- components/discount/freeRenewalCheckout.tsx
- hooks/useNeedAllowances.tsx
Additional comments not posted (9)
pages/argent.tsx (1)
1-12: Simplification of the Argent ComponentThe
Argentcomponent has been simplified to directly render theDiscountEndScreenwith a fixed message and image. This change removes any dynamic behavior related to user interactions and discount status checks.If this change is due to the permanent discontinuation of the discount feature, it's appropriate. However, it would be beneficial to add a comment or documentation within the code to clarify this change for future maintainers or developers.
context/FormProvider.tsx (1)
Line range hint
7-117: General approval with a suggestion for dependency array review.The changes in
FormProviderare well-aligned with the PR objectives, particularly the renaming ofdurationtodurationInYearsfor clarity. The use ofuseCallbackanduseMemois appropriate for optimizing performance. However, ensure that all dependency arrays are correctly specified to avoid issues with stale closures or unnecessary executions.Consider reviewing the following dependency arrays for correctness:
useMemofor metadata handling.useCallbackforupdateFormStateandclearForm.This review ensures that the functions behave as expected without causing performance issues or bugs due to missing dependencies.
tests/utils/subscriptionService.test.js (2)
Line range hint
4-39: Test suite forgetNonSubscribedDomainsis comprehensive and well-implemented.The test cases cover various scenarios effectively, ensuring that the function behaves as expected across different input configurations.
Line range hint
41-69: Test suite forfullIdsToDomainsis well-structured and effective.The test cases adequately validate the function's ability to correctly identify and return Stark root domains, ensuring robust functionality.
hooks/checkout/usePriceManagement.tsx (3)
1-11: Well-structured hook with appropriate imports.The
usePriceManagementhook is well-structured and includes all necessary imports for managing price-related logic in the application. The use ofbigintfor monetary values aligns with the PR's objectives to handle financial calculations more precisely.
13-41: Appropriate initial state setup and function parameters.The
usePriceManagementfunction is defined with a comprehensive set of parameters that are essential for managing pricing logic. The initial state setup usingbigintfor all monetary values is appropriate and aligns with the PR's objectives for precise financial calculations.
200-203: Simple and effective logging for sales tax amount changes.This
useEffectprovides a straightforward logging mechanism for tracking changes in the sales tax amount. This is useful for debugging and monitoring purposes. The implementation is simple and effective.components/domains/steps/checkoutCard.tsx (2)
Line range hint
1-36: Well-structured component with appropriate imports.The
CheckoutCardcomponent is well-structured and includes all necessary imports for managing various aspects of the domain checkout process. The imports are appropriate for the required functionalities, including price calculations, currency management, and transaction preparations.
25-36: Appropriate initial state setup and component props.The
CheckoutCardcomponent is defined with well-structured props to handle different forms and discounts in the domain checkout process. The initial state setup using hooks for managing call data and transaction execution is appropriate and aligns with the component's responsibilities.
| export const useCurrencyManagement = () => { | ||
| const [displayedCurrency, setDisplayedCurrency] = useState<CurrencyType>( | ||
| CurrencyType.ETH | ||
| ); | ||
| const [quoteData, setQuoteData] = useState<QuoteQueryData | null>(null); | ||
| const [currencyError, setCurrencyError] = useState<boolean>(false); | ||
| const [hasChosenCurrency, setHasChosenCurrency] = useState<boolean>(false); | ||
|
|
||
| const onCurrencySwitch = (currency: CurrencyType) => { | ||
| setDisplayedCurrency(currency); | ||
| setHasChosenCurrency(true); | ||
| }; | ||
|
|
||
| // we fetch the quote for the currency selected | ||
| useEffect(() => { | ||
| const fetchQuote = async () => { | ||
| if (displayedCurrency === CurrencyType.ETH) { | ||
| setQuoteData(null); | ||
| return; | ||
| } | ||
| const data = await getTokenQuote(ERC20Contract[displayedCurrency]); | ||
| if (data) { | ||
| setQuoteData(data); | ||
| setCurrencyError(false); | ||
| } else { | ||
| setDisplayedCurrency(CurrencyType.ETH); | ||
| setCurrencyError(true); | ||
| } | ||
| }; | ||
|
|
||
| const scheduleRefetch = () => { | ||
| const now = parseInt((new Date().getTime() / 1000).toFixed(0)); | ||
| const timeLimit = now - 60; // 60 seconds | ||
| if (!quoteData || displayedCurrency === CurrencyType.ETH) { | ||
| setQuoteData(null); | ||
| return; | ||
| } | ||
|
|
||
| if (quoteData.max_quote_validity <= timeLimit) { | ||
| fetchQuote(); | ||
| } | ||
|
|
||
| const timeUntilNextCheck = quoteData.max_quote_validity - timeLimit; | ||
| setTimeout(scheduleRefetch, Math.max(15000, timeUntilNextCheck * 100)); | ||
| }; | ||
|
|
||
| fetchQuote(); | ||
| scheduleRefetch(); | ||
| }, [displayedCurrency, quoteData]); | ||
|
|
||
| return { | ||
| displayedCurrency, | ||
| quoteData, | ||
| currencyError, | ||
| hasChosenCurrency, | ||
| onCurrencySwitch, | ||
| setHasChosenCurrency, | ||
| setCurrencyError, | ||
| }; |
There was a problem hiding this comment.
General approval with a suggestion for improvement.
The useCurrencyManagement hook is well-structured and handles state and side effects appropriately. However, consider clearing the timeout set in scheduleRefetch to prevent potential memory leaks. This can be done by returning a cleanup function from the useEffect that clears the timeout.
Consider adding the following cleanup logic:
useEffect(() => {
let timeoutId;
const scheduleRefetch = () => {
// existing logic
timeoutId = setTimeout(scheduleRefetch, Math.max(15000, timeUntilNextCheck * 100));
};
// existing fetch logic
return () => clearTimeout(timeoutId);
}, [displayedCurrency, quoteData]);There was a problem hiding this comment.
Rabbit a raison, en effet comme scheduleRefetch s'appelle elle même avec un timeout, si tu ne return pas dans ton useEffect de clearTimeout, alors à chaque reefresh du useEffect tu vas accumuler une boucle qui va tourner en parallèle pour rien. #874 (comment)
There was a problem hiding this comment.
@Marchand-Nicolas, merci pour la confirmation! Vous avez tout à fait raison, sans le clearTimeout dans le useEffect, on risque d'accumuler des boucles parallèles inutiles à chaque rafraîchissement du useEffect. C'est une bonne pratique d'ajouter cette fonction de nettoyage pour éviter les fuites de mémoire et les exécutions parallèles non désirées.
| export const useCurrencyManagement = () => { | ||
| const [displayedCurrency, setDisplayedCurrency] = useState<CurrencyType>( | ||
| CurrencyType.ETH | ||
| ); | ||
| const [quoteData, setQuoteData] = useState<QuoteQueryData | null>(null); | ||
| const [currencyError, setCurrencyError] = useState<boolean>(false); | ||
| const [hasChosenCurrency, setHasChosenCurrency] = useState<boolean>(false); | ||
|
|
||
| const onCurrencySwitch = (currency: CurrencyType) => { | ||
| setDisplayedCurrency(currency); | ||
| setHasChosenCurrency(true); | ||
| }; | ||
|
|
||
| // we fetch the quote for the currency selected | ||
| useEffect(() => { | ||
| const fetchQuote = async () => { | ||
| if (displayedCurrency === CurrencyType.ETH) { | ||
| setQuoteData(null); | ||
| return; | ||
| } | ||
| const data = await getTokenQuote(ERC20Contract[displayedCurrency]); | ||
| if (data) { | ||
| setQuoteData(data); | ||
| setCurrencyError(false); | ||
| } else { | ||
| setDisplayedCurrency(CurrencyType.ETH); | ||
| setCurrencyError(true); | ||
| } | ||
| }; | ||
|
|
||
| const scheduleRefetch = () => { | ||
| const now = parseInt((new Date().getTime() / 1000).toFixed(0)); | ||
| const timeLimit = now - 60; // 60 seconds | ||
| if (!quoteData || displayedCurrency === CurrencyType.ETH) { | ||
| setQuoteData(null); | ||
| return; | ||
| } | ||
|
|
||
| if (quoteData.max_quote_validity <= timeLimit) { | ||
| fetchQuote(); | ||
| } | ||
|
|
||
| const timeUntilNextCheck = quoteData.max_quote_validity - timeLimit; | ||
| setTimeout(scheduleRefetch, Math.max(15000, timeUntilNextCheck * 100)); | ||
| }; | ||
|
|
||
| fetchQuote(); | ||
| scheduleRefetch(); | ||
| }, [displayedCurrency, quoteData]); | ||
|
|
||
| return { | ||
| displayedCurrency, | ||
| quoteData, | ||
| currencyError, | ||
| hasChosenCurrency, | ||
| onCurrencySwitch, | ||
| setHasChosenCurrency, | ||
| setCurrencyError, | ||
| }; |
There was a problem hiding this comment.
Rabbit a raison, en effet comme scheduleRefetch s'appelle elle même avec un timeout, si tu ne return pas dans ton useEffect de clearTimeout, alors à chaque reefresh du useEffect tu vas accumuler une boucle qui va tourner en parallèle pour rien. #874 (comment)
Marchand-Nicolas
added
❌ Change request
fricoben
added
🔥 Ready for review
There was a problem hiding this comment.
Actionable comments posted: 0
Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Files selected for processing (1)
- hooks/checkout/useCurrencyManagement.tsx (1 hunks)
Files skipped from review as they are similar to previous changes (1)
- hooks/checkout/useCurrencyManagement.tsx
Description
biginteverywhere before displaying itMy E2E
/Registerin both currencies/Renewin both currencies/gift/subscriptionin both currencies/freerenewalin both currenciesSummary by CodeRabbit
New Features
durationtodurationInDaysordurationInYearsacross multiple components.biginttype for monetary values, improving precision in financial calculations.getDisplayablePriceandgetApprovalAmount.Notificationcomponent for user feedback on token quote retrieval failures.useCurrencyManagementfor managing currency selection and fetching token quotes.Bug Fixes
Documentation
Refactor
Chores