fix: rename memo -> note + add bip39 mnemonic check

sentinel-official · Apr 23, 2021 · a0661a9 · a0661a9
1 parent 665303b
commit a0661a9
Show file tree

Hide file tree

Showing 20 changed files with 59,345 additions and 11,534 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -71,5 +71,8 @@
       "last 1 firefox version",
       "last 1 safari version"
     ]
+  },
+  "dependencies": {
+    "bip39": "^3.0.3"
   }
 }
diff --git a/src/containers/Wallet/Proposals/Modal/Memo.js b/src/containers/Wallet/Proposals/Modal/Memo.js
@@ -1,5 +1,5 @@
 import * as PropTypes from 'prop-types';
-import { ValidateMemo } from './_validation';
+import { ValidateMemo } from '../../../common/_validation';
 import { connect } from 'react-redux';
 import { setTxVoteMemo } from '../../../../actions/transactions/vote';
 import React from 'react';
@@ -19,8 +19,8 @@ const Memo = (props) => {
         <TextArea
             className="form-control seed-text-field"
             error={props.input.error}
-            name="Memo"
-            placeholder="Enter Memo"
+            name="Note"
+            placeholder="Enter Note"
             required={true}
             rows={3}
             value={props.input.value}

diff --git a/src/containers/Wallet/Proposals/Modal/Vote.js b/src/containers/Wallet/Proposals/Modal/Vote.js
@@ -1,5 +1,5 @@
 import * as PropTypes from 'prop-types';
-import { ValidateMemo, ValidatePassword } from './_validation';
+import { ValidateMemo } from '../../../common/_validation';
 import { connect } from 'react-redux';
 import { txVote } from '../../../../actions/transactions/vote';
 import Button from '../../../../components/Button';

diff --git a/src/containers/Wallet/Proposals/Modal/_validation.js b/src/containers/Wallet/Proposals/Modal/_validation.js
diff --git a/src/containers/Wallet/Proposals/Modal/index.js b/src/containers/Wallet/Proposals/Modal/index.js
@@ -32,7 +32,7 @@ const Modal = ({
                 <div className="form-group">
                     <Label
                         className=""
-                        label="Memo"
+                        label="Note"
                     />
                     <Memo/>
                 </div>

diff --git a/src/containers/Wallet/Send/Modal/Memo.js b/src/containers/Wallet/Send/Modal/Memo.js
@@ -19,8 +19,8 @@ const Memo = (props) => {
         <TextArea
             className="form-control seed-text-field"
             error={props.input.error}
-            name="Memo"
-            placeholder="Enter Memo"
+            name="Note"
+            placeholder="Enter Note"
             required={true}
             rows={3}
             value={props.input.value}

diff --git a/src/containers/Wallet/Send/Modal/index.js b/src/containers/Wallet/Send/Modal/index.js
@@ -48,7 +48,7 @@ const Modal = ({
                 <div className="form-group">
                     <Label
                         className=""
-                        label="Memo"
+                        label="Note"
                     />
                     <Memo/>
                 </div>

diff --git a/src/containers/Wallet/Validators/ModalDelegate/Memo.js b/src/containers/Wallet/Validators/ModalDelegate/Memo.js
@@ -19,8 +19,8 @@ const Memo = (props) => {
         <TextArea
             className="form-control seed-text-field"
             error={props.input.error}
-            name="Memo"
-            placeholder="Enter Memo"
+            name="Note"
+            placeholder="Enter Note"
             required={true}
             rows={3}
             value={props.input.value}

diff --git a/src/containers/Wallet/Validators/ModalDelegate/index.js b/src/containers/Wallet/Validators/ModalDelegate/index.js
@@ -46,7 +46,7 @@ const ModalDelegate = (props) => {
                 <div className="form-group">
                     <Label
                         className=""
-                        label="Memo"
+                        label="Note"
                     />
                     <Memo/>
                 </div>

diff --git a/src/containers/Wallet/Validators/ModalRedelegate/Memo.js b/src/containers/Wallet/Validators/ModalRedelegate/Memo.js
@@ -19,8 +19,8 @@ const Memo = (props) => {
         <TextArea
             className="form-control seed-text-field"
             error={props.input.error}
-            name="Memo"
-            placeholder="Enter Memo"
+            name="Note"
+            placeholder="Enter Note"
             required={true}
             rows={3}
             value={props.input.value}

diff --git a/src/containers/Wallet/Validators/ModalRedelegate/index.js b/src/containers/Wallet/Validators/ModalRedelegate/index.js
@@ -54,7 +54,7 @@ const ModalRedelegate = (props) => {
                 <div className="form-group">
                     <Label
                         className=""
-                        label="Memo"
+                        label="Note"
                     />
                     <Memo/>
                 </div>

diff --git a/src/containers/Wallet/Validators/ModalUnbond/Memo.js b/src/containers/Wallet/Validators/ModalUnbond/Memo.js
@@ -19,8 +19,8 @@ const Memo = (props) => {
         <TextArea
             className="form-control seed-text-field"
             error={props.input.error}
-            name="Memo"
-            placeholder="Enter Memo"
+            name="Note"
+            placeholder="Enter Note"
             required={true}
             rows={3}
             value={props.input.value}

diff --git a/src/containers/Wallet/Validators/ModalUnbond/index.js b/src/containers/Wallet/Validators/ModalUnbond/index.js
@@ -47,7 +47,7 @@ const ModalUnbond = (props) => {
                 <div className="form-group">
                     <Label
                         className=""
-                        label="Memo"
+                        label="Note"
                     />
                     <Memo/>
                 </div>

diff --git a/src/containers/Wallet/WithdrawRewards/Modal/Memo.js b/src/containers/Wallet/WithdrawRewards/Modal/Memo.js
@@ -1,5 +1,5 @@
 import * as PropTypes from 'prop-types';
-import { ValidateMemo } from './_validation';
+import { ValidateMemo } from '../../../common/_validation';
 import { connect } from 'react-redux';
 import { setTxWithdrawMemo } from '../../../../actions/transactions/withdraw';
 import React from 'react';
@@ -19,8 +19,8 @@ const Memo = (props) => {
         <TextArea
             className="form-control seed-text-field"
             error={props.input.error}
-            name="Memo"
-            placeholder="Enter Memo"
+            name="Note"
+            placeholder="Enter Note"
             required={true}
             rows={3}
             value={props.input.value}

diff --git a/src/containers/Wallet/WithdrawRewards/Modal/Withdraw.js b/src/containers/Wallet/WithdrawRewards/Modal/Withdraw.js
@@ -1,5 +1,5 @@
 import * as PropTypes from 'prop-types';
-import { ValidateMemo, ValidatePassword } from './_validation';
+import { ValidateMemo, ValidatePassword } from '../../../common/_validation';
 import { connect } from 'react-redux';
 import { txWithdraw } from '../../../../actions/transactions/withdraw';
 import Button from '../../../../components/Button';

diff --git a/src/containers/Wallet/WithdrawRewards/Modal/_validation.js b/src/containers/Wallet/WithdrawRewards/Modal/_validation.js
diff --git a/src/containers/Wallet/WithdrawRewards/Modal/index.js b/src/containers/Wallet/WithdrawRewards/Modal/index.js
@@ -40,7 +40,7 @@ const Modal = (props) => {
                 <div className="form-group">
                     <Label
                         className=""
-                        label="Memo"
+                        label="Note"
                     />
                     <Memo/>
                 </div>

diff --git a/src/containers/common/_validation.js b/src/containers/common/_validation.js
@@ -1,4 +1,12 @@
+const bip39 = require('bip39');
+
 export const ValidateMemo = (value) => {
+    if (bip39.validateMnemonic(value.trim())) {
+        return new Error(
+            'This looks like a mnemonic. Please do not attach the mnemonic ' +
+            'or other sensitive data to note, as it is public and can be seen by anyone.');
+    }
+
     return new Error('');
 };