File tree Expand file tree Collapse file tree 1 file changed +5
-5
lines changed
src/profile/components/Settings/Penalties Expand file tree Collapse file tree 1 file changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -14,16 +14,16 @@ interface IProps {
14
14
15
15
const NO_RULES = 'Det er ingen prikkeregler enda. Kontakt styret for mer informasjon.' ;
16
16
17
- const inFuture = ( date : string ) => new Date ( date ) > new Date ( ) ;
18
-
19
17
const getLatestRuleSet = ( rules : IMarkRule [ ] ) : IMarkRule | null => {
20
18
if ( rules . length === 0 ) {
21
19
return null ;
22
20
}
23
21
22
+ const now = new Date ( ) ;
23
+
24
24
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 ;
27
27
28
28
if ( isRuleInFuture ) {
29
29
return latest ;
@@ -36,7 +36,7 @@ const getLatestRuleSet = (rules: IMarkRule[]): IMarkRule | null => {
36
36
return latest ;
37
37
} , rules [ 0 ] ) ;
38
38
39
- return inFuture ( ruleset . valid_from_date ) ? null : ruleset ;
39
+ return new Date ( ruleset . valid_from_date ) > now ? null : ruleset ;
40
40
} ;
41
41
42
42
export const Info = ( { rules } : IProps ) => {
You can’t perform that action at this time.
0 commit comments