Merge pull request #610 from Augmint/staging

Release v1.1.1 to production

Author: phraktle

src/containers/exchange/components/PlaceOrderForm.js

@@ -50,8 +50,6 @@ class PlaceOrderForm extends React.Component {
                 this.props.ethAmount
             );
         }
-
-        this.focusInput();
     }
 
     toggleOrderBook(e) {
@@ -62,8 +60,6 @@ class PlaceOrderForm extends React.Component {
     onOrderDirectionChange(e) {
         this.setState({ orderDirection: +e.target.attributes["data-index"].value });
         this.toggleOrderBook(+e.target.attributes["data-index"].value);
-
-        this.focusInput();
     }
 
     onTokenAmountChange(e) {
@@ -157,14 +153,6 @@ class PlaceOrderForm extends React.Component {
         return Math.round(price * 100) / 10000;
     }
 
-    focusInput() {
-        if (this.input && window.innerWidth > 768) {
-            ReactDOM.findDOMNode(this.input)
-                .getElementsByTagName("input")[0]
-                .focus();
-        }
-    }
-
     render() {
         const {
             header: mainHeader,
@@ -264,6 +252,7 @@ class PlaceOrderForm extends React.Component {
                             data-testid="tokenAmountInput"
                             style={{ borderRadius: theme.borderRadius.left }}
                             labelAlignRight="A-EUR"
+                            autoFocus={true}
                         />
 
                         <Styledlabel style={{ margin: "5px 0 0 0" }}>

src/containers/funding/components/AddWithdrawForm.js

@@ -28,10 +28,6 @@ class AddWithdrawForm extends React.Component {
         this.onTokenAmountChange = this.onTokenAmountChange.bind(this);
     }
 
-    componentDidUpdate() {
-        this.focusInput();
-    }
-
     onPriceChange(e) {
         const amount = e.target.value;
         this.setState({
@@ -82,8 +78,6 @@ class AddWithdrawForm extends React.Component {
     }
 
     onMenuClick(e) {
-        this.focusInput();
-
         if (e.target.attributes["data-index"].value === ADDFUND) {
             this.setState({
                 orderDirection: ADDFUND
@@ -95,14 +89,6 @@ class AddWithdrawForm extends React.Component {
         }
     }
 
-    focusInput() {
-        if (this.input && window.innerWidth > 768) {
-            ReactDOM.findDOMNode(this.input)
-                .getElementsByTagName("input")[0]
-                .focus();
-        }
-    }
-
     render() {
         const { error, user } = this.props;
         const { orderDirection, amount } = this.state;
@@ -188,6 +174,7 @@ class AddWithdrawForm extends React.Component {
                         data-testid={`${orderDirection}Input`}
                         style={{ borderRadius: theme.borderRadius.left }}
                         labelAlignRight={orderDirection === ADDFUND ? "EUR" : "A-EUR"}
+                        autoFocus={true}
                     />
                     <label>Available exchange partner:</label>
 

src/containers/loan/newLoan/NewLoanForm.js

@@ -90,12 +90,6 @@ class NewLoanForm extends React.Component {
             this.setProduct(); // needed when landing from on URL directly
         }
 
-        if (this.input && window.innerWidth > 768) {
-            ReactDOM.findDOMNode(this.input)
-                .getElementsByTagName("input")[0]
-                .focus();
-        }
-
         // if (!this.props.rates.isLoading && !this.state.initialized) {
         //     this.initForm();
         // }
@@ -332,6 +326,7 @@ class NewLoanForm extends React.Component {
                             data-testid="loanTokenAmountInput"
                             style={{ borderRadius: theme.borderRadius.left }}
                             labelAlignRight="A-EUR"
+                            autoFocus={true}
                         />
 
                         {this.state.productId !== null && this.state.productId !== undefined && (

src/containers/lock/containers/LockForm/index.js

@@ -69,12 +69,6 @@ class LockContainer extends React.Component {
         if (this.props.lockProducts && this.props.lockProducts.length && !this.state.initialized) {
             this.initForm();
         }
-
-        if (this.input && window.innerWidth > 768) {
-            ReactDOM.findDOMNode(this.input)
-                .getElementsByTagName("input")[0]
-                .focus();
-        }
     }
 
     resetAndInitForm() {
@@ -275,6 +269,7 @@ class LockContainer extends React.Component {
                             style={{ borderRadius: theme.borderRadius.left }}
                             labelAlignRight="A-EUR"
                             data-testid="lockAmountInput"
+                            autoFocus={true}
                         />
 
                         <Field

src/containers/transfer/components/TokenTransferForm.js

@@ -55,12 +55,6 @@ class TokenTransferForm extends React.Component {
 
             this.setState({ urlResolved: true });
         }
-
-        if (this.input && window.innerWidth > 768) {
-            ReactDOM.findDOMNode(this.input)
-                .getElementsByTagName("input")[0]
-                .focus();
-        }
     }
 
     onTokenAmountChange(e) {
@@ -179,6 +173,7 @@ class TokenTransferForm extends React.Component {
                                     data-testid="transferAmountInput"
                                     style={{ borderRadius: theme.borderRadius.left, marginBottom: "0" }}
                                     labelAlignRight="A-EUR"
+                                    autoFocus={true}
                                 />
                                 {(augmintToken.info.feeMax !== 0 ||
                                     augmintToken.info.feeMin !== 0 ||