From cce3025370111d42810a4478e10e81a4d0fad297 Mon Sep 17 00:00:00 2001
From: vv181 <ardywibisana@gmail.com>
Date: Thu, 18 Jul 2019 05:22:47 +0700
Subject: [PATCH 1/4] Make modal enter-able

---
 src/ui/component/walletSendTip/view.jsx       |  1 +
 src/ui/modal/modalConfirmTransaction/view.jsx | 16 +++++++----
 src/ui/modal/modalRemoveFile/view.jsx         | 28 ++++++++++---------
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/ui/component/walletSendTip/view.jsx b/src/ui/component/walletSendTip/view.jsx
index ceb53242c..1aa2026f3 100644
--- a/src/ui/component/walletSendTip/view.jsx
+++ b/src/ui/component/walletSendTip/view.jsx
@@ -95,6 +95,7 @@ class WalletSendTip extends React.PureComponent<Props, State> {
                 label={__('Send')}
                 disabled={isPending || tipError || !tipAmount}
                 onClick={this.handleSendButtonClicked}
+                type="submit"
               />
             }
             helper={
diff --git a/src/ui/modal/modalConfirmTransaction/view.jsx b/src/ui/modal/modalConfirmTransaction/view.jsx
index f22203f4f..026acb0e0 100644
--- a/src/ui/modal/modalConfirmTransaction/view.jsx
+++ b/src/ui/modal/modalConfirmTransaction/view.jsx
@@ -1,5 +1,7 @@
 // @flow
 import React from 'react';
+import Button from 'component/button';
+import { Form } from 'component/common/form';
 import { Modal } from 'modal/modal';
 
 type Props = {
@@ -23,18 +25,22 @@ class ModalConfirmTransaction extends React.PureComponent<Props> {
         isOpen
         title={__('Send LBC')}
         contentLabel={__('Confirm Transaction')}
-        type="confirm"
-        confirmButtonLabel={__('Send')}
-        onConfirmed={() => this.onConfirmed()}
+        type="custom"
+        // confirmButtonLabel={__('Send')}
+        // onConfirmed={() => this.onConfirmed()}
         onAborted={closeModal}
       >
-        <section className="card__content">
+        <Form className="card__content" onSubmit={() => this.onConfirmed()}>
           <p>{__('Sending: ')}</p>
           <blockquote>{amount} LBC</blockquote>
           <p>{__('To address: ')}</p>
           <blockquote>{address}</blockquote>
           <p>{__('Once the transaction is sent, it cannot be reversed.')}</p>
-        </section>
+          <div className="card__actions">
+            <Button autoFocus button="primary" label={__('Send')} onClick={() => this.onConfirmed()} />
+            <Button button="link" label={__('Cancel')} onClick={closeModal} />
+          </div>
+        </Form>
       </Modal>
     );
   }
diff --git a/src/ui/modal/modalRemoveFile/view.jsx b/src/ui/modal/modalRemoveFile/view.jsx
index ffd3ab354..1a24d05c6 100644
--- a/src/ui/modal/modalRemoveFile/view.jsx
+++ b/src/ui/modal/modalRemoveFile/view.jsx
@@ -1,7 +1,8 @@
 // @flow
 import React from 'react';
 import { Modal } from 'modal/modal';
-import { FormField } from 'component/common/form';
+import { Form, FormField } from 'component/common/form';
+import Button from 'component/button';
 import usePersistedState from 'util/use-persisted-state';
 
 type Props = {
@@ -23,22 +24,13 @@ function ModalRemoveFile(props: Props) {
   const outpoint = fileInfo ? fileInfo.outpoint : `${txid}:${nout}`;
 
   return (
-    <Modal
-      isOpen
-      title="Remove File"
-      contentLabel={__('Confirm File Remove')}
-      type="confirm"
-      confirmButtonLabel={__('Remove')}
-      confirmButtonDisabled={!deleteChecked && !abandonChecked}
-      onConfirmed={() => deleteFile(outpoint || '', deleteChecked, abandonChecked)}
-      onAborted={closeModal}
-    >
+    <Modal isOpen title="Remove File" contentLabel={__('Confirm File Remove')} type="custom" onAborted={closeModal}>
       <section className="card__content">
         <p>
           {__("Are you sure you'd like to remove")} <cite>{`"${title}"`}</cite> {__('from the LBRY app?')}
         </p>
       </section>
-      <section className="card__content">
+      <Form className="card__content" onSubmit={() => deleteFile(outpoint || '', deleteChecked, abandonChecked)}>
         <FormField
           name="file_delete"
           label={__('Also delete this file from my computer')}
@@ -56,7 +48,17 @@ function ModalRemoveFile(props: Props) {
             onChange={() => setAbandonChecked(!abandonChecked)}
           />
         )}
-      </section>
+        <div className="card__actions">
+          <Button
+            autoFocus
+            button="primary"
+            label={__('OK')}
+            disabled={!deleteChecked && !abandonChecked}
+            onClick={() => deleteFile(outpoint || '', deleteChecked, abandonChecked)}
+          />
+          <Button button="link" label={__('Cancel')} onClick={closeModal} />
+        </div>
+      </Form>
     </Modal>
   );
 }

From 47cf1db0d1eda7f0aa3de1105aa7d54d35a827e3 Mon Sep 17 00:00:00 2001
From: vv181 <ardywibisana@gmail.com>
Date: Thu, 18 Jul 2019 06:09:08 +0700
Subject: [PATCH 2/4] cleanup

---
 src/ui/modal/modalConfirmTransaction/view.jsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/ui/modal/modalConfirmTransaction/view.jsx b/src/ui/modal/modalConfirmTransaction/view.jsx
index 026acb0e0..195c0f36d 100644
--- a/src/ui/modal/modalConfirmTransaction/view.jsx
+++ b/src/ui/modal/modalConfirmTransaction/view.jsx
@@ -26,8 +26,6 @@ class ModalConfirmTransaction extends React.PureComponent<Props> {
         title={__('Send LBC')}
         contentLabel={__('Confirm Transaction')}
         type="custom"
-        // confirmButtonLabel={__('Send')}
-        // onConfirmed={() => this.onConfirmed()}
         onAborted={closeModal}
       >
         <Form className="card__content" onSubmit={() => this.onConfirmed()}>
@@ -37,7 +35,7 @@ class ModalConfirmTransaction extends React.PureComponent<Props> {
           <blockquote>{address}</blockquote>
           <p>{__('Once the transaction is sent, it cannot be reversed.')}</p>
           <div className="card__actions">
-            <Button autoFocus button="primary" label={__('Send')} onClick={() => this.onConfirmed()} />
+            <Button type="submit" button="primary" label={__('Send')} onClick={() => this.onConfirmed()} />
             <Button button="link" label={__('Cancel')} onClick={closeModal} />
           </div>
         </Form>

From 4b3bfae4776ee4bc0d634d27d653dc9673005308 Mon Sep 17 00:00:00 2001
From: vv181 <ardywibisana@gmail.com>
Date: Thu, 18 Jul 2019 06:30:37 +0700
Subject: [PATCH 3/4] cleanup

---
 src/ui/modal/modalConfirmTransaction/view.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ui/modal/modalConfirmTransaction/view.jsx b/src/ui/modal/modalConfirmTransaction/view.jsx
index 195c0f36d..72b9cee6d 100644
--- a/src/ui/modal/modalConfirmTransaction/view.jsx
+++ b/src/ui/modal/modalConfirmTransaction/view.jsx
@@ -35,7 +35,7 @@ class ModalConfirmTransaction extends React.PureComponent<Props> {
           <blockquote>{address}</blockquote>
           <p>{__('Once the transaction is sent, it cannot be reversed.')}</p>
           <div className="card__actions">
-            <Button type="submit" button="primary" label={__('Send')} onClick={() => this.onConfirmed()} />
+            <Button autoFocus button="primary" label={__('Send')} onClick={() => this.onConfirmed()} />
             <Button button="link" label={__('Cancel')} onClick={closeModal} />
           </div>
         </Form>

From c1e4c0c0123d415d43087d487c52b70f8187b9b9 Mon Sep 17 00:00:00 2001
From: vv181 <ardywibisana@gmail.com>
Date: Tue, 23 Jul 2019 04:20:08 +0700
Subject: [PATCH 4/4] enter-able modal encrypt

---
 src/ui/modal/modalWalletEncrypt/view.jsx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/ui/modal/modalWalletEncrypt/view.jsx b/src/ui/modal/modalWalletEncrypt/view.jsx
index e4c2bd22a..935383de9 100644
--- a/src/ui/modal/modalWalletEncrypt/view.jsx
+++ b/src/ui/modal/modalWalletEncrypt/view.jsx
@@ -1,6 +1,6 @@
 // @flow
 import React from 'react';
-import { Form, FormField } from 'component/common/form';
+import { Form, FormField, Submit } from 'component/common/form';
 import { Modal } from 'modal/modal';
 import Button from 'component/button';
 
@@ -94,9 +94,7 @@ class ModalWalletEncrypt extends React.PureComponent<Props, State> {
         isOpen
         title={__('Encrypt Wallet')}
         contentLabel={__('Encrypt Wallet')}
-        type="confirm"
-        confirmButtonLabel={__('Encrypt Wallet')}
-        abortButtonLabel={__('Cancel')}
+        type="custom"
         onConfirmed={() => this.submitEncryptForm()}
         onAborted={closeModal}
       >
@@ -135,6 +133,7 @@ class ModalWalletEncrypt extends React.PureComponent<Props, State> {
             )}
           </div>
           <FormField
+            inputButton={<Submit label={failMessage ? __('Encrypting Wallet') : __('Encrypt Wallet')} />}
             error={understandError === true ? 'You must enter "I understand"' : false}
             label={__('Enter "I understand"')}
             placeholder={__('Dear computer, I understand')}
@@ -144,6 +143,9 @@ class ModalWalletEncrypt extends React.PureComponent<Props, State> {
           />
           {failMessage && <div className="error-text">{__(failMessage)}</div>}
         </Form>
+        <div className="card__actions">
+          <Button button="link" label={__('Cancel')} onClick={closeModal} />
+        </div>
       </Modal>
     );
   }