BFLOWS/bflows-bandi-fe
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/phase-2

Browse Source
This commit is contained in:
Vitalii Kiiko
2024-10-16 12:10:51 +02:00
parent 487c6d0715 6e721e3640
commit 173e54ef60
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/FormField/components/Datepicker/index.js
View File

@@ -1,6 +1,7 @@
import React from 'react'; import React, { useEffect } from 'react';
import { classNames } from 'primereact/utils'; import { classNames } from 'primereact/utils';
import { Controller } from 'react-hook-form'; import { Controller } from 'react-hook-form';
import { is } from 'ramda';
import { Calendar } from 'primereact/calendar'; import { Calendar } from 'primereact/calendar';
@@ -30,7 +31,7 @@ const Datepicker = ({
render={({ field, fieldState }) => ( render={({ field, fieldState }) => (
<Calendar id={field.name} <Calendar id={field.name}
disabled={disabled} disabled={disabled}
value={field.value ?? []} value={is(String, field.value) ? new Date(field.value) : field.value}
onChange={(e) => field.onChange(e.value)} onChange={(e) => field.onChange(e.value)}
dateFormat="dd/mm/yy" dateFormat="dd/mm/yy"
hourFormat="24" hourFormat="24"

2
src/pages/Login/index.js
View File

@@ -117,7 +117,7 @@ const Login = () => {
</clipPath> </clipPath>
</defs> </defs>
</svg> </svg>
<span>{__('Entra con SPID', 'gepafin')}</span> <span>{__('Entra con SPID / CIE', 'gepafin')}</span>
</button> </button>
<div className="appPage__spacer"></div> <div className="appPage__spacer"></div>