Skip to content

UAT final changes #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jenbreese wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

UAT final changes #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 31 additions & 23 deletions app/interactives/compounding-frequency-calculator/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,25 +260,29 @@ export default function CompoundInterestCalculator() {
type="text"
value={initialAmount}
onChange={(e) => {
const input = e.target.value;
const numericPart = input.replace(/[^0-9.]/g, "");
const numericValue = parseFloat(numericPart);
const raw = e.target.value;
const numericValue = parseFloat(raw);
if (raw === "") {
setInitialAmountError("");
setInitialAmount("");
return;
}
if (
!isNaN(numericValue) &&
numericValue > MAX_INITIAL_AMOUNT
(numericValue < 0 || numericValue > MAX_INITIAL_AMOUNT)
) {
setInitialAmountError(
"Enter an amount between $0 and $100,000,000.",
);
setInitialAmount(numericPart);
setInitialAmount(raw);
} else {
setInitialAmountError("");
setInitialAmount(numericPart);
setInitialAmount(raw);
}
flagSkippedFields("initialAmount")
flagSkippedFields("initialAmount");
}}
onBlur={() => {
flagSkippedFields("initialAmount")
flagSkippedFields("initialAmount");
if (initialAmount.startsWith("."))
setInitialAmount("0" + initialAmount);
if (!initialAmount)
Expand Down Expand Up @@ -317,26 +321,30 @@ export default function CompoundInterestCalculator() {
<div className="relative">
<Input
id="annual-rate"
type="text"
type="number"
value={annualRate}
onChange={(e) => {
const input = e.target.value;
const numericPart = input.replace(/[^0-9.]/g, "");
const numericValue = parseFloat(numericPart);
const raw = e.target.value;
const numericValue = parseFloat(raw);
if (raw === "") {
setAnnualRateError("");
setAnnualRate("");
return;
}
if (
!isNaN(numericValue) &&
numericValue > MAX_ANNUAL_RATE
(numericValue < 0 || numericValue > MAX_ANNUAL_RATE)
) {
setAnnualRateError("Enter a rate between 0% and 1,000%.");
setAnnualRate(numericPart);
setAnnualRate(raw);
} else {
setAnnualRateError("");
setAnnualRate(numericPart);
setAnnualRate(raw);
}
flagSkippedFields("annualRate")
flagSkippedFields("annualRate");
}}
onBlur={() => {
flagSkippedFields("annualRate")
flagSkippedFields("annualRate");
if (annualRate.startsWith("."))
setAnnualRate("0" + annualRate);
if (!annualRate)
Expand Down Expand Up @@ -393,20 +401,20 @@ export default function CompoundInterestCalculator() {

setPeriods(cleaned);

if (cleaned !== "" && (Number(cleaned) < 0 || Number(cleaned) > maxPeriods)) {
if (
cleaned !== "" &&
(Number(cleaned) < 0 || Number(cleaned) > maxPeriods)
) {
setPeriodsError(
buildPeriodsRangeError(selectedCompounding, maxPeriods),
);
} else {
setPeriodsError("");
}
flagSkippedFields("periods")
}}
onKeyDown={(e) => {
if (e.key === "-" || e.key === "e") e.preventDefault();
flagSkippedFields("periods");
}}
onBlur={() => {
flagSkippedFields("periods")
flagSkippedFields("periods");
if (periods.startsWith(".")) setPeriods("0" + periods);
if (!periods)
setTimeout(
Expand Down
4 changes: 2 additions & 2 deletions app/interactives/present-value-calculator-v2/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function buildPeriodsRangeError(compounding: CompoundingFrequency, max: number):
const maxFormatted = max.toLocaleString("en-US")
const base = `Enter a number of ${label} between 0 and ${maxFormatted}.`
if (compounding === "annually") return base
return `${base} (${maxFormatted} periods = 100 years with ${freqLabels[compounding]} compounding).`
return `${base} (${maxFormatted} ${label} = 100 years with ${freqLabels[compounding]} compounding).`
}

// Prevents -0 from displaying in results (e.g. when future value equals present value).
Expand Down Expand Up @@ -296,7 +296,7 @@ export default function PresentValueCalculator() {
setTimeout(
() =>
setFutureValueError(
"Please enter a future value to calculate.",
"Please enter a future value.",
),
150,
);
Expand Down