Merge branch 'master' of https://git.2fi-solutions.com/alex/PNSPS-frontend-MaterialUI

# Conflicts:
#	src/auth/utils.js

src/auth/utils.js

@@ -10,9 +10,10 @@ export const hostname = 'localhost';
 const hostPort = '8090';
 export const hostPath = `http://${hostname}:${hostPort}`;
 //export const apiPath = `http://192.168.0.112:8090/api`;
-// export const apiPath = `${hostPath}/api`;
-export const apiPath = `/api`;
+export const apiPath = `${hostPath}/api`;
+// export const apiPath = `/api`;
 export const paymentPath = `http://pnspsdev.gld.gov.hk/payment`;
+export const iAmSmartPath = `https://<iAM_Smart_domain>`;
 
 
 export const isUserLoggedIn = () => {

src/pages/Payment/PaymentSuccess.js

@@ -227,7 +227,7 @@ const Index = () => {
                                                 </Grid>
                                                 <Grid item>
                                                     <FormLabel sx={{ fontSize: "16px", color: "#000000", textAlign: "center" }}>
-                                                        {transactionData.paymentdetail.brandname}
+                                                        {transactionData.paymentdetail.brandname??(transactionData.paymentdetail.paymentmethod==="01"?"PPS":"")}
                                                     </FormLabel>
                                                 </Grid>
                                             </Grid>