diff --git a/src/pages/Payment/Card/index.js b/src/pages/Payment/Card/index.js
index 7294907a..c7ecff5c 100644
--- a/src/pages/Payment/Card/index.js
+++ b/src/pages/Payment/Card/index.js
@@ -24,6 +24,7 @@ const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/Loa
import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png'
import {FormattedMessage} from "react-intl";
+import { ERROR_CONTAINED_BUTTON_SX } from "themes/colorConst";
const BackgroundHead = {
backgroundImage: `url(${titleBackgroundImg})`,
width: '100%',
@@ -161,11 +162,10 @@ const Index = () => {
component="span"
variant="contained"
size="large"
- color="error"
onClick={() => {
cancelPayment();
}}
- sx={{ m: 4 }}
+ sx={{ m: 4, ...ERROR_CONTAINED_BUTTON_SX }}
>
diff --git a/src/pages/Payment/FPS/FPS.js b/src/pages/Payment/FPS/FPS.js
index 5b9f7d97..d15031b2 100644
--- a/src/pages/Payment/FPS/FPS.js
+++ b/src/pages/Payment/FPS/FPS.js
@@ -4,6 +4,7 @@ import {
Typography,
Stack,
Button,
+ Box,
} from '@mui/material';
import * as React from "react";
import * as HttpUtils from "utils/HttpUtils";
@@ -23,6 +24,7 @@ const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/Loa
import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png'
import {FormattedMessage, useIntl} from "react-intl";
+import { PRIMARY_CONTAINED_BUTTON_SX, ERROR_CONTAINED_BUTTON_SX } from "themes/colorConst";
const BackgroundHead = {
backgroundImage: `url(${titleBackgroundImg})`,
width: '100%',
@@ -399,9 +401,23 @@ const Index = () => {
-
-
-
+
+ {!isError &&
+
+
+
+ }
+ {isError &&
+
+
+
+
+
+
+
+ }
+
+
@@ -409,12 +425,8 @@ const Index = () => {
{"HK$ " + currencyFormat(paymentData.amount)}
- {isError ?
-
-
-
- :
- browserType==mobileBrowser?
+ {!isError &&
+ (browserType==mobileBrowser?
{
sysEnv=="prod"?
@@ -480,26 +492,32 @@ const Index = () => {
>
}
- }
+ )}
-
+ {isError ?
+
+ :
+
+ }
diff --git a/src/pages/Payment/FPS/FPSTest.js b/src/pages/Payment/FPS/FPSTest.js
index 83da857d..cd34e35b 100644
--- a/src/pages/Payment/FPS/FPSTest.js
+++ b/src/pages/Payment/FPS/FPSTest.js
@@ -18,6 +18,7 @@ const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/Loa
import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png'
import {FormattedMessage} from "react-intl";
+import { ERROR_CONTAINED_BUTTON_SX } from "themes/colorConst";
const BackgroundHead = {
backgroundImage: `url(${titleBackgroundImg})`,
width: '100%',
@@ -322,11 +323,10 @@ const Index = () => {
component="span"
variant="contained"
size="large"
- color="error"
onClick={()=>{
cancelPayment();
}}
- sx={{ m: 4 }}
+ sx={{ m: 4, ...ERROR_CONTAINED_BUTTON_SX }}
>
diff --git a/src/pages/Payment/MultiPaymentWindow.js b/src/pages/Payment/MultiPaymentWindow.js
index 78cd292f..cf0315b0 100644
--- a/src/pages/Payment/MultiPaymentWindow.js
+++ b/src/pages/Payment/MultiPaymentWindow.js
@@ -277,23 +277,21 @@ const MultiPaymentWindow = (props) => {
maxWidth={'xl'}
fullScreen={props.isFullScreen}
>
-
-
-
-
-
- {windowTitle}
-
-
-
-
+
+
+ {windowTitle}
+