update dialog window and search heading to search form

src/pages/DemandNote/Create/SearchForm.js

@@ -186,7 +186,17 @@ const SearchPublicNoticeForm = ({ applySearch, issueComboData, _paymentCount, _p
                 </Grid>
             </form>
             <div>
-                <Dialog open={isFailPopUp} onClose={() => setIsFailPopUp(false)}  >
+                <Dialog
+                    open={isFailPopUp}
+                    onClose={() => setIsFailPopUp(false)}
+                    PaperProps={{
+                        sx: {
+                            minWidth: '40vw',
+                            maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' },
+                            maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' }
+                        }
+                    }}
+                >
                     <DialogTitle><Typography variant="h3">Action Fail</Typography></DialogTitle>
                     <DialogContent style={{ display: 'flex', }}>
                         <Typography variant="h4" style={{ padding: '16px' }}>{failText}</Typography>
@@ -197,7 +207,17 @@ const SearchPublicNoticeForm = ({ applySearch, issueComboData, _paymentCount, _p
                 </Dialog>
             </div>
             <div>
-                <Dialog open={isSuccessPopUp} onClose={() => setIsSuccessPopUp(false)}  >
+                <Dialog
+                    open={isSuccessPopUp}
+                    onClose={() => setIsSuccessPopUp(false)}
+                    PaperProps={{
+                        sx: {
+                            minWidth: '40vw',
+                            maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' },
+                            maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' }
+                        }
+                    }}
+                >
                     <DialogTitle><Typography variant="h3">Create Result</Typography></DialogTitle>
                     <DialogContent style={{ display: 'flex', }}>
                         <Grid container alignItems={"center"}>

src/pages/DemandNote/Search/DataGrid.js

@@ -353,7 +353,17 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch })
                 />
             </Box>
             <div>
-                <Dialog open={isErrorPopUp} onClose={() => setIsErrorPopUp(false)}  >
+                <Dialog
+                    open={isErrorPopUp}
+                    onClose={() => setIsErrorPopUp(false)}
+                    PaperProps={{
+                        sx: {
+                            minWidth: '40vw',
+                            maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' },
+                            maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' }
+                        }
+                    }}
+                >
                     <DialogTitle><Typography variant="h3">Action Fail</Typography></DialogTitle>
                     <DialogContent style={{ display: 'flex', }}>
                         <Typography variant="h4" style={{ padding: '16px' }}>Number of DN record must less than 100.<br />Please edit search form.</Typography>
@@ -364,7 +374,17 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch })
                 </Dialog>
             </div>
             <div>
-                <Dialog open={selectonWarning} onClose={() => setSelectonWarning(false)}  >
+                <Dialog
+                    open={selectonWarning}
+                    onClose={() => setSelectonWarning(false)}
+                    PaperProps={{
+                        sx: {
+                            minWidth: '40vw',
+                            maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' },
+                            maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' }
+                        }
+                    }}
+                >
                     <DialogTitle><Typography variant="h3">Warning</Typography></DialogTitle>
                     <DialogContent style={{ display: 'flex', }}>
                         <Typography variant="h4" style={{ padding: '16px' }}>Please Select DN.</Typography>
@@ -375,7 +395,17 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch })
                 </Dialog>
             </div>
             <div>
-                <Dialog open={isConfirmPopUp} onClose={() => setConfirmPopUp(false)}  >
+                <Dialog
+                    open={isConfirmPopUp}
+                    onClose={() => setConfirmPopUp(false)}
+                    PaperProps={{
+                        sx: {
+                            minWidth: '40vw',
+                            maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' },
+                            maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' }
+                        }
+                    }}
+                >
                     <DialogTitle><Typography variant="h3">Confirm</Typography></DialogTitle>
                     <DialogContent style={{ display: 'flex', }}>
                         <Typography variant="h4" style={{ padding: '16px' }}>Are you sure to mark DN paid?</Typography>
@@ -387,7 +417,17 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch })
                 </Dialog>
             </div>
             <div>
-                <Dialog open={isSendPopUp} onClose={() => setSendPopUp(false)}  >
+                <Dialog
+                    open={isSendPopUp}
+                    onClose={() => setSendPopUp(false)}
+                    PaperProps={{
+                        sx: {
+                            minWidth: '40vw',
+                            maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' },
+                            maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' }
+                        }
+                    }}
+                >
                     <DialogTitle><Typography variant="h3">Confirm</Typography></DialogTitle>
                     <DialogContent style={{ display: 'flex', }}>
                         <Typography variant="h4" style={{ padding: '16px' }}>Are you sure to send DN?</Typography>
@@ -399,7 +439,17 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch })
                 </Dialog>
             </div>
             <div>
-                <Dialog open={wait} onClose={() => setWait(false)}  >
+                <Dialog
+                    open={wait}
+                    onClose={() => setWait(false)}
+                    PaperProps={{
+                        sx: {
+                            minWidth: '40vw',
+                            maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' },
+                            maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' }
+                        }
+                    }}
+                >
                     <DialogContent style={{ display: 'flex', }}>
                         <Typography variant="h4" style={{ padding: '16px' }}>Calculating, please wait ...</Typography>
                     </DialogContent>

src/pages/DemandNote/Search_Public/SearchForm.js

@@ -84,7 +84,7 @@ const SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData
                         <CardContent sx={{ px: 2.5, pt: 3 }}>
                             <Grid item justifyContent="space-between" alignItems="center" >
                                 <Typography variant="h4">
-                                    <FormattedMessage id="search"/>
+                                    <FormattedMessage id="searchForm"/>
                                 </Typography>
                             </Grid>
                         </CardContent>

src/pages/Message/Search/SearchForm.js

@@ -64,7 +64,7 @@ const SearchForm = ({ applySearch, searchCriteria }) => {
                 <CardContent sx={{ px: 2.5, pt: 3 }}>
                     <Grid item justifyContent="space-between" alignItems="center" >
                         <Typography variant="h4">
-                            <FormattedMessage id="search"/>
+                            <FormattedMessage id="searchForm"/>
                         </Typography>
                     </Grid>
                 </CardContent>

src/pages/Organization/DetailPage/OrganizationCard.js

@@ -400,7 +400,17 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                 }
             </form>
             <div>
-                <Dialog open={creditorConfirmPopUp} onClose={() => setCreditorConfirmPopUp(false)}  >
+                <Dialog
+                    open={creditorConfirmPopUp}
+                    onClose={() => setCreditorConfirmPopUp(false)}
+                    PaperProps={{
+                        sx: {
+                            minWidth: '40vw',
+                            maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' },
+                            maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' }
+                        }
+                    }}
+                >
                     <DialogTitle><Typography variant="h3">Confirm</Typography></DialogTitle>
                     <DialogContent style={{ display: 'flex', }}>
                         <Typography variant="h4" style={{ padding: '16px' }}>Are you sure mark as Creditor?</Typography>
@@ -412,7 +422,17 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                 </Dialog>
             </div>
             <div>
-                <Dialog open={nonCreditorConfirmPopUp} onClose={() => setNonCreditorConfirmPopUp(false)}  >
+                <Dialog
+                    open={nonCreditorConfirmPopUp}
+                    onClose={() => setNonCreditorConfirmPopUp(false)}
+                    PaperProps={{
+                        sx: {
+                            minWidth: '40vw',
+                            maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' },
+                            maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' }
+                        }
+                    }}
+                >
                     <DialogTitle><Typography variant="h3">Confirm</Typography></DialogTitle>
                     <DialogContent style={{ display: 'flex', }}>
                         <Typography variant="h4" style={{ padding: '16px' }}>Are you sure mark as Non-Creditor?</Typography>

src/pages/Organization/DetailPage/OrganizationPubCard.js

@@ -321,7 +321,17 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                 }
             </form>
             <div>
-                <Dialog open={creditorConfirmPopUp} onClose={() => setCreditorConfirmPopUp(false)}  >
+                <Dialog
+                    open={creditorConfirmPopUp}
+                    onClose={() => setCreditorConfirmPopUp(false)}
+                    PaperProps={{
+                        sx: {
+                            minWidth: '40vw',
+                            maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' },
+                            maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' }
+                        }
+                    }}
+                >
                     <DialogTitle><Typography variant="h3">Confirm</Typography></DialogTitle>
                     <DialogContent style={{ display: 'flex', }}>
                         <Typography variant="h4" style={{ padding: '16px' }}>Are you sure mark as Creditor?</Typography>
@@ -333,7 +343,17 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
                 </Dialog>
             </div>
             <div>
-                <Dialog open={nonCreditorConfirmPopUp} onClose={() => setNonCreditorConfirmPopUp(false)}  >
+                <Dialog
+                    open={nonCreditorConfirmPopUp}
+                    onClose={() => setNonCreditorConfirmPopUp(false)}
+                    PaperProps={{
+                        sx: {
+                            minWidth: '40vw',
+                            maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' },
+                            maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' }
+                        }
+                    }}
+                >
                     <DialogTitle><Typography variant="h3">Confirm</Typography></DialogTitle>
                     <DialogContent style={{ display: 'flex', }}>
                         <Typography variant="h4" style={{ padding: '16px' }}>Are you sure mark as Non-Creditor?</Typography>

src/pages/Organization/DetailPage_FromUser/OrganizationCard_loadFromUser.js

@@ -256,7 +256,17 @@ const OrganizationCard_loadFromUser = ({ userData, userId }) => {
             </div>
 
             <div>
-                <Dialog open={isFailPopUp} onClose={() => setIsFailPopUp(false)}  >
+                <Dialog
+                    open={isFailPopUp}
+                    onClose={() => setIsFailPopUp(false)}
+                    PaperProps={{
+                        sx: {
+                            minWidth: '40vw',
+                            maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' },
+                            maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' }
+                        }
+                    }}
+                >
                     <DialogTitle><Typography variant="h3">Action Fail</Typography></DialogTitle>
                     <DialogContent style={{ display: 'flex', }}>
                         <Typography variant="h4" style={{ padding: '16px' }}>{failText}</Typography>

src/pages/Payment/Search_Public/SearchForm.js

@@ -69,7 +69,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
                 <CardContent sx={{ px: 2.5, pt: 3 }}>
                     <Grid item justifyContent="space-between" alignItems="center" >
                         <Typography variant="h4">
-                            <FormattedMessage id="search"/>
+                            <FormattedMessage id="searchForm"/>
                         </Typography>
                     </Grid>
                 </CardContent>

src/pages/Payment/index.js

@@ -433,7 +433,17 @@ const Index = () => {
             </Grid>
             {/*row 2*/}
             <div>
-                <Dialog open={expiryDateErr} onClose={() => setExpiryDateErr(false)}  >
+                <Dialog
+                    open={expiryDateErr}
+                    onClose={() => setExpiryDateErr(false)}
+                    PaperProps={{
+                        sx: {
+                            minWidth: '40vw',
+                            maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' },
+                            maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' }
+                        }
+                    }}
+                >
                     <DialogTitle></DialogTitle>
                     <Typography variant="h2" style={{ padding: '16px' }}>行動失敗</Typography>
                     <DialogContent style={{ display: 'flex', }}>

src/pages/Proof/Create_FromApp/ProofForm.js

@@ -428,7 +428,17 @@ const FormPanel = ({ formData }) => {
 
             </form>
             <div>
-                <Dialog open={isWarningPopUp} onClose={() => setIsWarningPopUp(false)}  >
+                <Dialog
+                    open={isWarningPopUp}
+                    onClose={() => setIsWarningPopUp(false)}
+                    PaperProps={{
+                        sx: {
+                            minWidth: '40vw',
+                            maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' },
+                            maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' }
+                        }
+                    }}
+                >
                     <DialogTitle><Typography variant="h3">Warning</Typography></DialogTitle>
                     <DialogContent style={{ display: 'flex', }}>
                         <Typography variant="h4" style={{ padding: '16px' }}>{warningText}</Typography>
@@ -439,7 +449,17 @@ const FormPanel = ({ formData }) => {
                 </Dialog>
             </div>
             <div>
-                <Dialog open={wait} onClose={() => setWait(false)}  >
+                <Dialog
+                    open={wait}
+                    onClose={() => setWait(false)}
+                    PaperProps={{
+                        sx: {
+                            minWidth: '40vw',
+                            maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' },
+                            maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' }
+                        }
+                    }}
+                >
                     <DialogContent style={{ display: 'flex', }}>
                         <Typography variant="h4" style={{ padding: '16px' }}>Calculating, please wait ...</Typography>
                     </DialogContent>

src/pages/Proof/Reply_GLD/ApplicationDetails.js

@@ -294,7 +294,10 @@ const ApplicationDetailCard = ({
                     </Grid>
                 </Grid>
                 <div>
-                    <Dialog open={cancelPopUp} onClose={() => setCancelPopUp(false)}  >
+                    <Dialog
+                        open={cancelPopUp}
+                        onClose={() => setCancelPopUp(false)}
+                    >
                         <DialogTitle><Typography variant="h3">Confirm</Typography></DialogTitle>
                         <DialogContent style={{ display: 'flex', }}>
                             <Typography variant="h4" style={{ padding: '16px' }}>Are you sure you want to cancel this proof?</Typography>

src/pages/Proof/Reply_Public/ProofForm.js

@@ -322,7 +322,17 @@ const FormPanel = ({ formData }) => {
 
             </form>
             <div>
-                <Dialog open={isWarningPopUp} onClose={() => setIsWarningPopUp(false)}  >
+                <Dialog
+                    open={isWarningPopUp}
+                    onClose={() => setIsWarningPopUp(false)}
+                    PaperProps={{
+                        sx: {
+                            minWidth: '40vw',
+                            maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' },
+                            maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' }
+                        }
+                    }}
+                >
                     <DialogTitle>
                         <FormattedMessage id="attention"/>
                     </DialogTitle>

src/pages/Proof/Search_Public/SearchForm.js

@@ -103,7 +103,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData
                 <CardContent sx={{ px: 2.5, pt: 3 }}>
                     <Grid item justifyContent="space-between" alignItems="center">
                         <Typography variant="h4">
-                            <FormattedMessage id="search"/>
+                            <FormattedMessage id="searchForm"/>
                         </Typography>
                     </Grid>
                 </CardContent>

src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js

@@ -279,7 +279,17 @@ const PublicNoticeApplyForm = ({ loadedData, selections }) => {
                 </Box>
             </Grid>
             <div>
-                <Dialog open={isWarningPopUp} onClose={() => setIsWarningPopUp(false)}  >
+                <Dialog
+                    open={isWarningPopUp}
+                    onClose={() => setIsWarningPopUp(false)}
+                    PaperProps={{
+                        sx: {
+                            minWidth: '40vw',
+                            maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' },
+                            maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' }
+                        }
+                    }}
+                >
                     <DialogTitle>
                         <FormattedMessage id="attention"/>
                     </DialogTitle>

src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js

@@ -537,7 +537,17 @@ const ApplicationDetailCard = (
                     </Grid>
                 </form>
                 <div>
-                    <Dialog open={isWarningPopUp} onClose={() => setIsWarningPopUp(false)}  >
+                    <Dialog
+                        open={isWarningPopUp}
+                        onClose={() => setIsWarningPopUp(false)}
+                        PaperProps={{
+                            sx: {
+                                minWidth: '40vw',
+                                maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' },
+                                maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' }
+                            }
+                        }}
+                    >
                         <DialogTitle><Typography variant="h3">Warning</Typography></DialogTitle>
                         <DialogContent style={{ display: 'flex', }}>
                             <Typography variant="h4" style={{ padding: '16px' }}>{warningText}</Typography>

src/pages/PublicNotice/Details_GLD/GazetteDetailCard.js

@@ -262,7 +262,16 @@ const GazetteDetailCard = (
                     </Grid>
                 </form>
                 <div>
-                <Dialog open={isWarningPopUp} onClose={() => setIsWarningPopUp(false)}  >
+                <Dialog
+                    open={isWarningPopUp}
+                    onClose={() => setIsWarningPopUp(false)}
+                    PaperProps={{
+                        sx: {
+                            minWidth: '40vw',
+                            maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' },
+                            maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' }
+                        }
+                    }}>
                     <DialogTitle><Typography variant="h3">Warning</Typography></DialogTitle>
                     <DialogContent style={{ display: 'flex', }}>
                         <Typography variant="h4" style={{ padding: '16px' }}>{warningText}</Typography>

src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js

@@ -633,7 +633,17 @@ const ApplicationDetailCard = (
                         </Dialog>
                     </div>
                     <div>
-                        <Dialog open={errorPopUp} onClose={() => setErrorPopUp(false)}  >
+                        <Dialog
+                            open={errorPopUp}
+                            onClose={() => setErrorPopUp(false)}
+                            PaperProps={{
+                                sx: {
+                                    minWidth: '40vw',
+                                    maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' },
+                                    maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' }
+                                }
+                            }}
+                        >
                             <DialogTitle></DialogTitle>
                             <Typography variant="h2" style={{ padding: '16px' }}>行動失敗</Typography>
                             <DialogContent style={{ display: 'flex', }}>

src/pages/PublicNotice/Details_Public/StatusChangeDialog.js

@@ -21,15 +21,16 @@ import * as yup from 'yup';
 import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst";
 import {ThemeProvider} from "@emotion/react";
 import {FormattedMessage} from "react-intl";
-
+import {useIntl} from "react-intl";
 
 const StatusChangeDialog = (props) => {
   const [status, setStatus] = useState("");
-  
+  const intl = useIntl();
+
   useEffect(() => {
     console.log(Object.keys(!props.selectedGazetteGroup).length)
     if(props.getStatus === "cancel"){
-      setStatus("取消")
+      setStatus(intl.formatMessage({id: 'cancel'}))
     }
   }, [props.getStatus]);
   
@@ -60,8 +61,8 @@ const StatusChangeDialog = (props) => {
         maxWidth={'xs'}
       >
         <DialogTitle >
-          <Typography variant="h4" color="error">
-            {status}公共啟事
+          <Typography variant="h4">
+            {status} {intl.formatMessage({id: 'publicNotice'})}
           </Typography>
         </DialogTitle>
         <FormikProvider value={formik}>
@@ -69,7 +70,8 @@ const StatusChangeDialog = (props) => {
               <DialogContent>
                 <DialogContentText>
                   <FormLabel sx={{fontSize: "18px", color:"#000000",textAlign:"center"}}>
-                    <Typography variant="h5">確定{status}公共啟事?</Typography>
+                    <Typography variant="h5">
+                      {intl.formatMessage({id: 'confirmTo'})}{status} {intl.formatMessage({id: 'publicNotice'})}?</Typography>
                   </FormLabel>
                 </DialogContentText>
               </DialogContent>
@@ -82,7 +84,7 @@ const StatusChangeDialog = (props) => {
                 variant="contained"
                 onClick={props.handleClose}
                 autoFocus
-                color="delete"
+                color="cancel"
             >
               <FormattedMessage id="cancel"/>
             </Button>

src/pages/PublicNotice/ListPanel/PendingPaymentTab.js

@@ -365,7 +365,17 @@ export default function SubmittedTab({ rows }) {
             </div>
 
             <div>
-                <Dialog open={checkCareOf} onClose={() => setCheckCareOf(false)}  >
+                <Dialog
+                    open={checkCareOf}
+                    onClose={() => setCheckCareOf(false)}
+                    PaperProps={{
+                        sx: {
+                            minWidth: '40vw',
+                            maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' },
+                            maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' }
+                        }
+                    }}
+                >
                     <DialogTitle></DialogTitle>
                     <Typography variant="h2" style={{ padding: '16px' }}>Warning</Typography>
                     <DialogContent style={{ display: 'flex', }}>
@@ -390,7 +400,17 @@ export default function SubmittedTab({ rows }) {
             </div>
 
             <div>
-                <Dialog open={expiryDateErr} onClose={() => setExpiryDateErr(false)}  >
+                <Dialog
+                    open={expiryDateErr}
+                    onClose={() => setExpiryDateErr(false)}
+                    PaperProps={{
+                        sx: {
+                            minWidth: '40vw',
+                            maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' },
+                            maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' }
+                        }
+                    }}
+                >
                     <DialogTitle></DialogTitle>
                     <Typography variant="h2" style={{ padding: '16px' }}>行動失敗</Typography>
                     <DialogContent style={{ display: 'flex', }}>

src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js

@@ -65,7 +65,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
                 {/*row 1*/}
                 <Grid item justifyContent="space-between" alignItems="center" sx={{mt:1,ml:3,mb:marginBottom}}>
                     <Typography variant="pnspsFormHeader" >
-                        <FormattedMessage id="search"/>
+                        <FormattedMessage id="searchForm"/>
                     </Typography>
                 </Grid>
                 {/*row 2*/}

src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js

@@ -577,7 +577,17 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
                 </form>
             }
             <div>
-                <Dialog open={isWarningPopUp} onClose={() => setIsWarningPopUp(false)}  >
+                <Dialog
+                    open={isWarningPopUp}
+                    onClose={() => setIsWarningPopUp(false)}
+                    PaperProps={{
+                        sx: {
+                            minWidth: '40vw',
+                            maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' },
+                            maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' }
+                        }
+                    }}
+                >
                     <DialogTitle><Typography variant="h3">Warning</Typography></DialogTitle>
                     <DialogContent style={{ display: 'flex', }}>
                         <Typography variant="h4" style={{ padding: '16px' }}>{warningText}</Typography>
@@ -588,7 +598,17 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
                 </Dialog>
             </div>
             <div>
-                <Dialog open={isConfirmPopUp} onClose={() => setIsConfirmPopUp(false)}  >
+                <Dialog
+                    open={isConfirmPopUp}
+                    onClose={() => setIsConfirmPopUp(false)}
+                    PaperProps={{
+                        sx: {
+                            minWidth: '40vw',
+                            maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' },
+                            maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' }
+                        }
+                    }}
+                >
                     <DialogTitle><Typography variant="h3">Confirm</Typography></DialogTitle>
                     <DialogContent style={{ display: 'flex', }}>
                         <Typography variant="h4" style={{ padding: '16px' }}>{confirmText}</Typography>

src/pages/User/ManagePage_OrgPublic/index.js

@@ -238,7 +238,17 @@ const ManageOrgUserPage = () => {
                 />
             </Grid>
             <div>
-                <Dialog open={isWarningPopUp} onClose={() => setIsWarningPopUp(false)}  >
+                <Dialog
+                    open={isWarningPopUp}
+                    onClose={() => setIsWarningPopUp(false)}
+                    PaperProps={{
+                        sx: {
+                            minWidth: '40vw',
+                            maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' },
+                            maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' }
+                        }
+                    }}
+                >
                     <DialogTitle>
                         <FormattedMessage id="confirm" />
                     </DialogTitle>

src/pages/_Test/Mail/index.js

@@ -92,7 +92,17 @@ const Mail = () => {
                 </form>
 
                 <div>
-                    <Dialog open={isResponsPopUp} onClose={() => setIsResponsPopUp(false)}  >
+                    <Dialog
+                        open={isResponsPopUp}
+                        onClose={() => setIsResponsPopUp(false)}
+                        PaperProps={{
+                            sx: {
+                                minWidth: '40vw',
+                                maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' },
+                                maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' }
+                            }
+                        }}
+                    >
                         <DialogTitle>Respons</DialogTitle>
                         <DialogContent style={{ display: 'flex', }}>
                             <Typography variant="h3" style={{ padding: '16px' }}>{responsText}</Typography>

src/translations/en.json

@@ -43,6 +43,7 @@
 
   "mainPage": "Main Page",
   "myPublicNotice": "My Public Notice",
+  "publicNotice": "Public Notice",
   "publicNoticePayment": "Public Notice: Payment",
   "publicNoticePaymentFail": "Public Notice: Payment Failed",
   "publicNoticePaymentSuccess": "Public Notice: Payment Success",
@@ -265,6 +266,7 @@
   "contactPerson": "Contact Person",
   "requireContactPerson": "Please enter contact person",
   "search": "Search",
+  "searchForm": "Search Form",
   "cancel": "Cancel",
   "extraMark": "Remarks",
   "totalAmount": "Total Amount",
@@ -371,6 +373,7 @@
   "nameChi": "Name (Ch)",
   "expiryDate": "Expiry date",
   "create": "Create",
+  "confirmTo": "Confirm to ",
 
   "Dashboard": "Dashboard",
   "event": "Event"

src/translations/zh-CN.json

@@ -42,6 +42,7 @@
   "registerFail": "申请失败，请稍后尝试",
 
   "mainPage": "主页",
+  "publicNotice": "公共启事",
   "myPublicNotice": "我的公共启事",
   "publicNoticePayment": "公共启事：付款",
   "publicNoticePaymentFail": "公共启事：付款失败",
@@ -265,6 +266,7 @@
   "contactPerson": "联络人",
   "requireContactPerson": "请输入联络人",
   "search": "搜寻",
+  "searchForm": "搜寻表格",
   "cancel": "取消",
   "extraMark": "备注",
   "totalAmount": "总额",
@@ -371,6 +373,7 @@
   "nameChi": "姓名(中文)",
   "expiryDate": "过期日期",
   "create": "创建",
+  "confirmTo": "确定",
 
   "Dashboard": "仪表板",
   "event": "活动"

src/translations/zh-HK.json

@@ -42,6 +42,7 @@
   "registerFail": "申請失敗，請稍後嘗試",
 
   "mainPage": "主頁",
+  "publicNotice": "公共啟事",
   "myPublicNotice": "我的公共啟事",
   "publicNoticePayment": "公共啟事：付款",
   "publicNoticePaymentFail": "公共啟事：付款失敗",
@@ -265,6 +266,7 @@
   "contactPerson": "聯絡人",
   "requireContactPerson": "請輸入聯絡人",
   "search": "搜尋",
+  "searchForm": "搜尋表格",
   "cancel": "取消",
   "extraMark": "備註",
   "totalAmount": "總額",
@@ -371,6 +373,7 @@
   "nameChi": "姓名(中文)",
   "expiryDate": "過期日期",
   "create": "創建",
+  "confirmTo": "確定",
 
   "Dashboard": "儀表板",
   "event": "活動"