Merge pull request #3 from OmniFlix/code_updates

account switch while disconnected, copy button issues resolved.
OmniFlix · Oct 1, 2021 · afcca85 · afcca85
2 parents 166441d + ce24c90
commit afcca85
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 8 deletions.
diff --git a/src/components/CopyButton/TextButton.js b/src/components/CopyButton/TextButton.js
@@ -11,7 +11,7 @@ const CopyButton = (props) => {
     };
 
     const handleCopy = (e) => {
-        navigator.clipboard.writeText(props.data);
+        navigator && navigator.clipboard && navigator.clipboard.writeText(props.data);
 
         e.stopPropagation();
         setOpen(true);

diff --git a/src/components/CopyButton/index.js b/src/components/CopyButton/index.js
@@ -12,7 +12,7 @@ const CopyButton = (props) => {
     };
 
     const handleCopy = (e) => {
-        navigator.clipboard.writeText(props.data);
+        navigator && navigator.clipboard && navigator.clipboard.writeText(props.data);
 
         e.stopPropagation();
         setOpen(true);

diff --git a/src/containers/NavBar/index.js b/src/containers/NavBar/index.js
@@ -77,7 +77,11 @@ class NavBar extends Component {
                 }
             });
         }
-        window.addEventListener('keplr_keystorechange', this.handleChain);
+        window.addEventListener('keplr_keystorechange', () => {
+            if (localStorage.getItem('of_co_address') || this.props.address) {
+                this.handleChain();
+            }
+        });
     }
 
     componentDidUpdate (pp, ps, ss) {

diff --git a/src/containers/Stake/Table.js b/src/containers/Stake/Table.js
@@ -11,6 +11,7 @@ import { commaSeparator } from '../../utils/numberFormats';
 import ValidatorName from './ValidatorName';
 import { config } from '../../config';
 import ConnectButton from '../NavBar/ConnectButton';
+import classNames from 'classnames';
 
 class Table extends Component {
     render () {
@@ -56,8 +57,14 @@ class Table extends Component {
             options: {
                 sort: false,
                 customBodyRender: (value) => (
-                    <div className="status" title={value}>
-                        {value}
+                    <div
+                        className={classNames('status', value.jailed ? 'red_status' : '')}
+                        title={value.status === 1 ? 'unbonding'
+                            : value.status === 2 ? 'unbonded'
+                                : value.status === 3 ? 'active' : ''}>
+                        {value.status === 1 ? 'unbonding'
+                            : value.status === 2 ? 'unbonded'
+                                : value.status === 3 ? 'active' : ''}
                     </div>
                 ),
             },
@@ -128,9 +135,7 @@ class Table extends Component {
             ? dataToMap.map((item) =>
                 [
                     item,
-                    item.status === 1 ? 'unbonding'
-                        : item.status === 2 ? 'unbonded'
-                            : item.status === 3 ? 'active' : '',
+                    item,
                     (Number(item.tokens) / 1000000).toFixed(1),
                     item.commission && item.commission.commission_rates &&
                     item.commission.commission_rates.rate

diff --git a/src/containers/Stake/index.css b/src/containers/Stake/index.css
@@ -136,6 +136,11 @@
     padding: 6px 12px;
 }
 
+.table td .status.red_status {
+    border: 1px solid #ff0000;
+    color: #ff0000;
+}
+
 .table tfoot td {
     border-bottom: unset;
 }