Merge branch 'bukopin' into devops-staging

src/common/pages/App/index.js

@@ -560,7 +560,7 @@ class App extends React.Component {
         <WithdrawDialog />
 
         <div className={classes.root}>
-          <AppBar position="fixed">
+          <AppBar style={{ zIndex: 1 }} position="fixed">
             <Toolbar className={classes.toolbar}>
               <div className={classes.sectionMobile}>
                 <IconButton className={classes.menuButton} color="action" aria-label="Open drawer" onClick={this.toggleDrawerNew(true)}>

src/common/pages/Wallet/Modal/index.js

@@ -49,24 +49,34 @@ export default class ModalTopupComponent extends React.Component {
       }
     ]
 
-    var rightCode = {}
+    let rightCode = {};
 
     codeList.map((cl) => {
       if (cl.code === code){
         rightCode = cl
-        this.props.appstate.wallet.data.wallet = this.props.appstate.wallet.data.wallet + cl.amount
+      }}
-        message.success("Voucher redeem success");
+    )
-        this.setState({
+
-          confirmLoading: false
+    this.setState({
-        });
+      inputCode1: '',
-        this.state.onOk()
+      inputCode2: '',
-      }else{
+      inputCode3: '',
-        this.setState({
+      inputCode4: ''
-          confirmLoading: false
+    });
-        });
+
-        message.warning("Voucher redeem failed")
+    if (rightCode.code){
-      }
+      message.success("Voucher redeem success");
-    })
+      this.props.appstate.wallet.data.wallet = this.props.appstate.wallet.data.wallet + rightCode.amount
+      this.setState({
+        confirmLoading: false
+      });
+      this.state.onOk()
+    }else{
+      this.setState({
+        confirmLoading: false
+      });
+      message.warning("Voucher redeem failed")
+    }
 }
 
   render() {