From 292addc08145d7210c27e362bb829d8b6421e9c7 Mon Sep 17 00:00:00 2001
From: Reckless_Satoshi <reckless.satoshi@protonmail.com>
Date: Sat, 29 Jan 2022 06:42:54 -0800
Subject: [PATCH] Fix stateless tradebox

---
 frontend/src/components/OrderPage.js | 70 ++++++++++------------------
 frontend/src/components/TradeBox.js  |  4 +-
 2 files changed, 25 insertions(+), 49 deletions(-)

diff --git a/frontend/src/components/OrderPage.js b/frontend/src/components/OrderPage.js
index ae75fd41..da923dc9 100644
--- a/frontend/src/components/OrderPage.js
+++ b/frontend/src/components/OrderPage.js
@@ -36,39 +36,6 @@ function pn(x) {
   return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
 }
 
-function TabPanel(props) {
-  const { children, value, index, ...other } = props;
-  return (
-    <div
-      role="tabpanel"
-      hidden={value !== index}
-      id={`simple-tabpanel-${index}`}
-      aria-labelledby={`simple-tab-${index}`}
-      {...other}
-    >
-      {value === index && (
-        <Box sx={{ p: 3 }}>
-          <Typography>{children}</Typography>
-        </Box>
-      )}
-    </div>
-  );
-}
-
-TabPanel.propTypes = {
-  children: PropTypes.node,
-  index: PropTypes.number.isRequired,
-  value: PropTypes.number.isRequired,
-};
-
-function a11yProps(index) {
-  return {
-    id: `simple-tab-${index}`,
-    'aria-controls': `simple-tabpanel-${index}`,
-  };
-}
-
-
 export default class OrderPage extends Component {
   constructor(props) {
     super(props);
@@ -80,6 +47,7 @@ export default class OrderPage extends Component {
         loading: true,
         openCancel: false,
         openCollaborativeCancel: false,
+        showContractBox: 1,
     };
     this.orderId = this.props.match.params.orderId;
     this.getCurrencyDict();
@@ -334,7 +302,7 @@ export default class OrderPage extends Component {
         </DialogContent>
         <DialogActions>
           <Button onClick={this.handleClickCloseCollaborativeCancelDialog} autoFocus>Go back</Button>
-          <Button onClick={this.handleClickConfirmCollaborativeCancelButton}> Proceed and Ask for Cancel </Button>
+          <Button onClick={this.handleClickConfirmCollaborativeCancelButton}> Ask for Cancel </Button>
         </DialogActions>
       </Dialog>
     )
@@ -542,36 +510,46 @@ export default class OrderPage extends Component {
             {this.orderBox()}
         </Grid>
         <Grid item xs={6} align="left">
-          <TradeBox data={this.state} completeSetState={this.completeSetState} />
+          <TradeBox width={330} data={this.state} completeSetState={this.completeSetState} />
         </Grid>
       </Grid>
     )
   }
   
+  a11yProps(index) {
+    return {
+      id: `simple-tab-${index}`,
+      'aria-controls': `simple-tabpanel-${index}`,
+    };
+  }
+
   doubleOrderPagePhone=()=>{
 
-    const [value, setValue] = React.useState(1);
+    const [value, setValue] = React.useState(this.state.showContractBox);
 
     const handleChange = (event, newValue) => {
+      this.setState({showContractBox:newValue})
       setValue(newValue);
     };
 
     return(
       <Box sx={{ width: '100%' }}>
         <Box sx={{ borderBottom: 1, borderColor: 'divider' }}>
-          <Tabs value={value} onChange={handleChange} aria-label="basic tabs" variant="fullWidth">
-            <Tab label="Order Details" {...a11yProps(0)} />
-            <Tab label="Contract Box" {...a11yProps(1)} />
+          <Tabs value={value} onChange={handleChange} variant="fullWidth" >
+            <Tab label="Order Details" {...this.a11yProps(0)} />
+            <Tab label="Contract Box" {...this.a11yProps(1)} />
           </Tabs>
         </Box>
-        <TabPanel value={value} index={0}>
-          <Grid container style={{ width:330}}>
-            {this.orderBox()}
+        <Grid container spacing={2}>
+          <Grid item >
+            <div style={{ width:330, display: this.state.showContractBox == 0 ? '':'none'}}>
+                {this.orderBox()}
+            </div>
+            <div style={{display: this.state.showContractBox == 1 ? '':'none'}}>
+              <TradeBox width={330} data={this.state} completeSetState={this.completeSetState} />
+            </div>
           </Grid>
-        </TabPanel>
-        <TabPanel value={value} index={1}>
-          <TradeBox data={this.state} completeSetState={this.completeSetState} />
-        </TabPanel>
+        </Grid>
       </Box>
   );
   }
diff --git a/frontend/src/components/TradeBox.js b/frontend/src/components/TradeBox.js
index cf4f26d7..0dc5ebfc 100644
--- a/frontend/src/components/TradeBox.js
+++ b/frontend/src/components/TradeBox.js
@@ -360,8 +360,6 @@ export default class TradeBox extends Component {
     return (
 
       <Grid container spacing={1}>
-        {/* In case the taker was very fast to scan the bond, make the taker found alarm sound again */}
-        <this.Sound soundFileName="taker-found"/>
         <Grid item xs={12} align="center">
           <Typography color="primary" component="subtitle1" variant="subtitle1">
             <b> Submit a LN invoice for {pn(this.props.data.invoice_amount)} Sats </b>
@@ -769,7 +767,7 @@ handleRatingChange=(e)=>{
 
   render() {
     return (
-      <Grid container spacing={1} style={{ width:330}}>
+      <Grid container spacing={1} style={{ width:this.props.width}}>
         <this.ConfirmDisputeDialog/>
         <this.ConfirmFiatReceivedDialog/>
         <Grid item xs={12} align="center">