Properly handle <enter> keystroke (MetaMask#7747)

* Properly handle <enter> keystroke, closes MetaMask#7737 * no-unused-vars
yqrashawn · Jan 14, 2020 · 3179d2d · 3179d2d
1 parent 8a12f30
commit 3179d2d
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 29 deletions.
diff --git a/ui/app/components/ui/button/button.component.js b/ui/app/components/ui/button/button.component.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react'
+import React from 'react'
 import PropTypes from 'prop-types'
 import classnames from 'classnames'
 
@@ -24,33 +24,42 @@ const typeHash = {
   'first-time': CLASSNAME_FIRST_TIME,
 }
 
-export default class Button extends Component {
-  static propTypes = {
-    type: PropTypes.string,
-    large: PropTypes.bool,
-    className: PropTypes.string,
-    children: PropTypes.oneOfType([
-      PropTypes.string,
-      PropTypes.array,
-      PropTypes.element,
-    ]),
-  }
+const Button = ({
+  type,
+  submit,
+  large,
+  children,
+  className,
+  ...buttonProps
+}) => (
+  <button
+    type={submit && 'submit'}
+    className={classnames(
+      'button',
+      typeHash[type] || CLASSNAME_DEFAULT,
+      large && CLASSNAME_LARGE,
+      className
+    )}
+    {...buttonProps}
+  >
+    {children}
+  </button>
+)
 
-  render () {
-    const { type, large, className, ...buttonProps } = this.props
+Button.propTypes = {
+  type: PropTypes.string,
+  submit: PropTypes.bool,
+  large: PropTypes.bool,
+  className: PropTypes.string,
+  children: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.array,
+    PropTypes.element,
+  ]),
+}
 
-    return (
-      <button
-        className={classnames(
-          'button',
-          typeHash[type] || CLASSNAME_DEFAULT,
-          large && CLASSNAME_LARGE,
-          className
-        )}
-        {...buttonProps}
-      >
-        {this.props.children}
-      </button>
-    )
-  }
+Button.defaultProps = {
+  submit: false,
 }
+
+export default Button
diff --git a/...st-time-flow/create-password/import-with-seed-phrase/import-with-seed-phrase.component.js b/...st-time-flow/create-password/import-with-seed-phrase/import-with-seed-phrase.component.js
@@ -307,9 +307,9 @@ export default class ImportWithSeedPhrase extends PureComponent {
         </div>
         <Button
           type="primary"
+          submit
           className="first-time-flow__button"
           disabled={!this.isValid() || !termsChecked}
-          onClick={this.handleImport}
         >
           {t('import')}
         </Button>