Remove debug line, add Form components

src/renderer/component/splash/view.jsx

@@ -38,7 +38,6 @@ export class SplashScreen extends React.PureComponent<Props, State> {
   updateStatus() {
     Lbry.status().then(status => {
       this._updateStatusCallback(status);
-      window.status = status;
     });
   }
 

src/renderer/modal/modalWalletDecrypt/view.jsx

@@ -1,6 +1,6 @@
 // @flow
 import React from 'react';
-import { FormRow, FormField } from 'component/common/form';
+import { Form, FormRow, FormField } from 'component/common/form';
 import { Modal } from 'modal/modal';
 import Button from 'component/button';
 
@@ -43,16 +43,18 @@ class ModalWalletDecrypt extends React.PureComponent<Props> {
         onConfirmed={() => this.submitDecryptForm()}
         onAborted={closeModal}
       >
+        <Form onSubmit={() => this.submitDecryptForm()}>
           {__(
             'Your wallet has been encrypted with a local password, performing this action will remove this password.'
           )}
-        <FormRow padded>
+          <div className="card__actions">
             <Button
               button="link"
               label={__('Learn more')}
               href="https://lbry.io/faq/wallet-encryption"
             />
-        </FormRow>
+          </div>
+        </Form>
       </Modal>
     );
   }

src/renderer/modal/modalWalletEncrypt/view.jsx

@@ -1,6 +1,6 @@
 // @flow
 import React from 'react';
-import { FormRow, FormField } from 'component/common/form';
+import { Form, FormRow, FormField } from 'component/common/form';
 import { Modal } from 'modal/modal';
 import Button from 'component/button';
 
@@ -89,6 +89,7 @@ class ModalWalletEncrypt extends React.PureComponent<Props> {
         onConfirmed={() => this.submitEncryptForm()}
         onAborted={closeModal}
       >
+        <Form onSubmit={() => this.submitEncryptForm()}>
           {__(
             'Encrypting your wallet will require a password to access your local wallet data when LBRY starts. Please enter a new password for your wallet.'
           )}
@@ -126,14 +127,15 @@ class ModalWalletEncrypt extends React.PureComponent<Props> {
               onChange={event => this.onChangeUnderstandConfirm(event)}
             />
           </FormRow>
-        <FormRow padded>
+          <div className="card__actions">
             <Button
               button="link"
               label={__('Learn more')}
               href="https://lbry.io/faq/wallet-encryption"
             />
-        </FormRow>
+          </div>
           {failMessage && <div className="error-text">{__(failMessage)}</div>}
+        </Form>
       </Modal>
     );
   }

src/renderer/modal/modalWalletUnlock/view.jsx

@@ -1,6 +1,6 @@
 // @flow
 import React from 'react';
-import { FormRow, FormField } from 'component/common/form';
+import { Form, FormRow, FormField } from 'component/common/form';
 import { Modal } from 'modal/modal';
 import Button from 'component/button';
 
@@ -43,6 +43,7 @@ class ModalWalletUnlock extends React.PureComponent<Props> {
         onConfirmed={() => unlockWallet(password)}
         onAborted={quit}
       >
+        <Form onSubmit={() => unlockWallet(password)}>
           {__(
             'Your wallet has been encrypted with a local password. Please enter your wallet password to proceed.'
           )}
@@ -56,13 +57,14 @@ class ModalWalletUnlock extends React.PureComponent<Props> {
               onChange={event => this.onChangePassword(event)}
             />
           </FormRow>
-        <FormRow padded>
+          <div className="card__actions">
             <Button
               button="link"
               label={__('Learn more')}
               href="https://lbry.io/faq/wallet-encryption"
             />
-        </FormRow>
+          </div>
+        </Form>
       </Modal>
     );
   }