update register combo bug and i18n

src/components/FiDataGrid.js

@@ -122,6 +122,7 @@ export function FiDataGrid({ rows, columns, sx, autoHeight,
             {...props}
             rows={_rows}
             columns={_columns}
+            disableColumnMenu
             rowModesModel={_rowModesModel}
             pageSizeOptions={_pageSizeOptions}
             editMode={_editMode}

src/pages/authentication/Verify.js

@@ -63,7 +63,7 @@ export default function Verify() {
                             <Stack mt={1} direction="column" justifyContent="flex-start" alignItems="center" spacing={2}>
                                 <CheckCircleOutlineIcon color="success" sx={{ width: "200px", height: "200px" }} />
                                 <Typography display="inline" variant="h4">帳戶已成功驗證。</Typography>
-                                <Button variant="outlined" component={Link} to="/login" sx={{ fontSize: 20, height: '60px' }}><Typography variant="h5">
+                                <Button variant="outlined" component={Link} to="/login"><Typography variant="h5">
                                     <FormattedMessage id="backToLogin"/>
                                 </Typography></Button>
                             </Stack>
@@ -73,7 +73,7 @@ export default function Verify() {
                                 {/* <Button disabled={true} hidden={true} variant="contained" type="submit" sx={{ fontSize: 12,height:'25px'}}>Submit</Button> */}
                                 <CancelOutlinedIcon color="error" sx={{ width: "200px", height: "200px" }} />
                                 <Typography display="inline" variant="h4">驗證失敗，請聯絡相關的系統管理員協助。</Typography>
-                                <Button color="error" variant="outlined" component={Link} to="/login" sx={{ fontSize: 20, height: '60px' }}><Typography variant="h5">
+                                <Button color="error" variant="outlined" component={Link} to="/login"><Typography variant="h5">
                                     <FormattedMessage id="backToLogin"/>
                                 </Typography></Button>
                             </Stack>

src/pages/authentication/auth-forms/BusCustomFormWizard.js

@@ -323,8 +323,8 @@ const BusCustomFormWizard = (props) => {
     const { handleSubmit } = useForm({})
     const _onSubmit = () => {
         setLoding(true);
-        values.address4 = selectedAddress4
-        values.address5 = selectedAddress5
+        values.address4 = selectedAddress4.key
+        values.address5 = selectedAddress5.key
         // console.log(values)
         const busUserAddress = {
             "addressLine1": "",
@@ -1637,7 +1637,8 @@ const BusCustomFormWizard = (props) => {
                                         <Typography display="inline" variant="h4">
                                             <FormattedMessage id="emailSent"/>
                                         </Typography>
-                                        <Button variant="outlined" component={Link} to="/login" sx={{ fontSize: 20, height: '60px' }}><Typography variant="pnspsFormHeader">
+                                        <Button variant="outlined" component={Link} to="/login" >
+                                            <Typography variant="pnspsFormHeader">
                                             <FormattedMessage id="backToLogin"/>
                                         </Typography></Button>
                                     </Stack>
@@ -1646,8 +1647,10 @@ const BusCustomFormWizard = (props) => {
                                     <Stack mt={1} direction="column" justifyContent="flex-start" alignItems="center" spacing={2}>
                                         {/* <Button disabled={true} hidden={true} variant="contained" type="submit" sx={{ fontSize: 12,height:'25px'}}>Submit</Button> */}
                                         <CancelOutlinedIcon color="error" sx={{ width: "200px", height: "200px" }} />
-                                        <Typography display="inline" variant="h4">申請失敗，請稍後嘗試</Typography>
-                                        <Button color="error" variant="outlined" component={Link} to="/login" sx={{ fontSize: 20, height: '60px' }}><Typography variant="pnspsFormHeader">
+                                        <Typography display="inline" variant="h4">
+                                            <FormattedMessage id="registerFail" />
+                                        </Typography>
+                                        <Button color="error" variant="outlined" component={Link} to="/login" ><Typography variant="pnspsFormHeader">
                                             <FormattedMessage id="backToLogin"/>
                                         </Typography></Button>
                                     </Stack>

src/pages/authentication/auth-forms/CustomFormWizard.js

@@ -1801,7 +1801,7 @@ const CustomFormWizard = (props) => {
                                         <Typography display="inline" variant="h4">
                                             <FormattedMessage id="emailSent"/>
                                         </Typography>
-                                        <Button variant="outlined" component={Link} to="/login" sx={{ fontSize: 20, height: '60px' }}><Typography variant="pnspsFormHeader">
+                                        <Button variant="outlined" component={Link} to="/login" ><Typography variant="pnspsFormHeader">
                                             <FormattedMessage id="backToLogin"/>
                                         </Typography></Button>
                                     </Stack>
@@ -1810,8 +1810,10 @@ const CustomFormWizard = (props) => {
                                     <Stack mt={1} direction="column" justifyContent="flex-start" alignItems="center" spacing={2}>
                                         {/* <Button disabled={true} hidden={true} variant="contained" type="submit" sx={{ fontSize: 12,height:'25px'}}>Submit</Button> */}
                                         <CancelOutlinedIcon color="error" sx={{ width: "200px", height: "200px" }} />
-                                        <Typography display="inline" variant="h4">申請失敗，請稍後嘗試</Typography>
-                                        <Button color="error" variant="outlined" component={Link} to="/login" sx={{ fontSize: 20, height: '60px' }}><Typography variant="pnspsFormHeader">
+                                        <Typography display="inline" variant="h4">
+                                            <FormattedMessage id="registerFail" />
+                                        </Typography>
+                                        <Button color="error" variant="outlined" component={Link} to="/login" ><Typography variant="pnspsFormHeader">
                                             <FormattedMessage id="backToLogin"/>
                                         </Typography></Button>
                                     </Stack>

src/pages/authentication/auth-forms/IAmSmartFormWizard.js

@@ -1041,7 +1041,7 @@ const CustomFormWizard = (props) => {
                                         <Typography display="inline" variant="h4">
                                             <FormattedMessage id="emailSent"/>
                                         </Typography>
-                                        <Button variant="outlined" component={Link} to="/login" sx={{ fontSize: 20, height: '60px' }}><Typography variant="h5">
+                                        <Button variant="outlined" component={Link} to="/login" ><Typography variant="h5">
                                             <FormattedMessage id="backToLogin"/>
                                         </Typography></Button>
                                     </Stack>
@@ -1050,8 +1050,10 @@ const CustomFormWizard = (props) => {
                                     <Stack mt={1} direction="column" justifyContent="flex-start" alignItems="center" spacing={2}>
                                         {/* <Button disabled={true} hidden={true} variant="contained" type="submit" sx={{ fontSize: 12,height:'25px'}}>Submit</Button> */}
                                         <CancelOutlinedIcon color="error" sx={{ width: "200px", height: "200px" }} />
-                                        <Typography display="inline" variant="h4">申請失敗，請稍後嘗試</Typography>
-                                        <Button color="error" variant="outlined" component={Link} to="/login" sx={{ fontSize: 20, height: '60px' }}><Typography variant="h5">
+                                        <Typography display="inline" variant="h4">
+                                            <FormattedMessage id="registerFail" />
+                                        </Typography>
+                                        <Button color="error" variant="outlined" component={Link} to="/login" ><Typography variant="h5">
                                             <FormattedMessage id="backToLogin"/>
                                         </Typography></Button>
                                     </Stack>

src/translations/en.json

@@ -39,6 +39,7 @@
   "submit": "Submit",
   "backToLogin": "Return to login page",
   "registerSubmitted": "Account application submitted successfully.",
+  "registerFail": "Application failed, please try again later",
 
   "mainPage": "Main Page",
   "myPublicNotice": "My Public Notice",

src/translations/zh-CN.json

@@ -39,6 +39,7 @@
   "submit": "提交",
   "backToLogin": "返回登入页面",
   "registerSubmitted": "帐户申请已成功提交。",
+  "registerFail": "申请失败，请稍后尝试",
 
   "mainPage": "主页",
   "myPublicNotice": "我的公共启事",

src/translations/zh-HK.json

@@ -39,6 +39,7 @@
   "submit": "提交",
   "backToLogin": "返回登入頁面",
   "registerSubmitted": "帳戶申請已成功提交。",
+  "registerFail": "申請失敗，請稍後嘗試",
 
   "mainPage": "主頁",
   "myPublicNotice": "我的公共啟事",