Merge branch 'develop' into feature/phase-2
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
import React from 'react';
|
||||
import React, { useEffect } from 'react';
|
||||
import { classNames } from 'primereact/utils';
|
||||
import { Controller } from 'react-hook-form';
|
||||
import { is } from 'ramda';
|
||||
|
||||
import { Calendar } from 'primereact/calendar';
|
||||
|
||||
@@ -30,7 +31,7 @@ const Datepicker = ({
|
||||
render={({ field, fieldState }) => (
|
||||
<Calendar id={field.name}
|
||||
disabled={disabled}
|
||||
value={field.value ?? []}
|
||||
value={is(String, field.value) ? new Date(field.value) : field.value}
|
||||
onChange={(e) => field.onChange(e.value)}
|
||||
dateFormat="dd/mm/yy"
|
||||
hourFormat="24"
|
||||
|
||||
@@ -117,7 +117,7 @@ const Login = () => {
|
||||
</clipPath>
|
||||
</defs>
|
||||
</svg>
|
||||
<span>{__('Entra con SPID', 'gepafin')}</span>
|
||||
<span>{__('Entra con SPID / CIE', 'gepafin')}</span>
|
||||
</button>
|
||||
|
||||
<div className="appPage__spacer"></div>
|
||||
|
||||
Reference in New Issue
Block a user