Skip to content

Commit 490144a

Browse files
committed
refactor: remove inFuture helper function
1 parent cd492f6 commit 490144a

File tree

1 file changed

+5
-5
lines changed
  • src/profile/components/Settings/Penalties

1 file changed

+5
-5
lines changed

src/profile/components/Settings/Penalties/Rules.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ interface IProps {
1414

1515
const NO_RULES = 'Det er ingen prikkeregler enda. Kontakt styret for mer informasjon.';
1616

17-
const inFuture = (date: string) => new Date(date) > new Date();
18-
1917
const getLatestRuleSet = (rules: IMarkRule[]): IMarkRule | null => {
2018
if (rules.length === 0) {
2119
return null;
2220
}
2321

22+
const now = new Date();
23+
2424
const ruleset = rules.reduce((latest, rule) => {
25-
const isLatestInFuture = inFuture(latest.valid_from_date);
26-
const isRuleInFuture = inFuture(rule.valid_from_date);
25+
const isLatestInFuture = new Date(latest.valid_from_date) > now;
26+
const isRuleInFuture = new Date(rule.valid_from_date) > now;
2727

2828
if (isRuleInFuture) {
2929
return latest;
@@ -36,7 +36,7 @@ const getLatestRuleSet = (rules: IMarkRule[]): IMarkRule | null => {
3636
return latest;
3737
}, rules[0]);
3838

39-
return inFuture(ruleset.valid_from_date) ? null : ruleset;
39+
return new Date(ruleset.valid_from_date) > now ? null : ruleset;
4040
};
4141

4242
export const Info = ({ rules }: IProps) => {

0 commit comments

Comments
 (0)