Merge pull request #26 from ergoplatform/deadit#update_whole_project

Deadit#update whole project
ergoplatform · Jan 31, 2021 · 78bfc01 · 78bfc01
2 parents 8d19400 + 26d084b
commit 78bfc01
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 20 deletions.
diff --git a/build/asset-manifest.json b/build/asset-manifest.json
@@ -1,15 +1,15 @@
 {
   "files": {
     "main.css": "/static/css/main.0e9161bb.chunk.css",
-    "main.js": "/static/js/main.021e0207.chunk.js",
-    "main.js.map": "/static/js/main.021e0207.chunk.js.map",
+    "main.js": "/static/js/main.f279ca07.chunk.js",
+    "main.js.map": "/static/js/main.f279ca07.chunk.js.map",
     "runtime-main.js": "/static/js/runtime-main.219240e0.js",
     "runtime-main.js.map": "/static/js/runtime-main.219240e0.js.map",
     "static/css/2.9338f6a1.chunk.css": "/static/css/2.9338f6a1.chunk.css",
     "static/js/2.403e76f2.chunk.js": "/static/js/2.403e76f2.chunk.js",
     "static/js/2.403e76f2.chunk.js.map": "/static/js/2.403e76f2.chunk.js.map",
     "index.html": "/index.html",
-    "precache-manifest.ddd980e8a049b4769668bd1dbf7afa0f.js": "/precache-manifest.ddd980e8a049b4769668bd1dbf7afa0f.js",
+    "precache-manifest.f040045e0deb84c673ab57e20ec4cf2d.js": "/precache-manifest.f040045e0deb84c673ab57e20ec4cf2d.js",
     "service-worker.js": "/service-worker.js",
     "static/css/2.9338f6a1.chunk.css.map": "/static/css/2.9338f6a1.chunk.css.map",
     "static/css/main.0e9161bb.chunk.css.map": "/static/css/main.0e9161bb.chunk.css.map",
@@ -25,6 +25,6 @@
     "static/css/2.9338f6a1.chunk.css",
     "static/js/2.403e76f2.chunk.js",
     "static/css/main.0e9161bb.chunk.css",
-    "static/js/main.021e0207.chunk.js"
+    "static/js/main.f279ca07.chunk.js"
   ]
 }
diff --git a/build/index.html b/build/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="/favicon.svg"/><meta name="viewport" content="minimum-scale=1,initial-scale=1,width=device-width,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="/manifest.json"/><title>Ergo node interface</title><link href="/static/css/2.9338f6a1.chunk.css" rel="stylesheet"><link href="/static/css/main.0e9161bb.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><div id="modal-root"></div><script>!function(l){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],f=0,i=[];f<n.length;f++)t=n[f],Object.prototype.hasOwnProperty.call(c,t)&&c[t]&&i.push(c[t][0]),c[t]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(l[r]=o[r]);for(s&&s(e);i.length;)i.shift()();return p.push.apply(p,u||[]),a()}function a(){for(var e,r=0;r<p.length;r++){for(var t=p[r],n=!0,o=1;o<t.length;o++){var u=t[o];0!==c[u]&&(n=!1)}n&&(p.splice(r--,1),e=f(f.s=t[0]))}return e}var t={},c={1:0},p=[];function f(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return l[e].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.m=l,f.c=t,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(r,e){if(1&e&&(r=f(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)f.d(t,n,function(e){return r[e]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="/";var r=this["webpackJsonpergo-node-interface"]=this["webpackJsonpergo-node-interface"]||[],n=r.push.bind(r);r.push=e,r=r.slice();for(var o=0;o<r.length;o++)e(r[o]);var s=n;a()}([])</script><script src="/static/js/2.403e76f2.chunk.js"></script><script src="/static/js/main.021e0207.chunk.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="/favicon.svg"/><meta name="viewport" content="minimum-scale=1,initial-scale=1,width=device-width,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="/manifest.json"/><title>Ergo node interface</title><link href="/static/css/2.9338f6a1.chunk.css" rel="stylesheet"><link href="/static/css/main.0e9161bb.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><div id="modal-root"></div><script>!function(l){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],f=0,i=[];f<n.length;f++)t=n[f],Object.prototype.hasOwnProperty.call(c,t)&&c[t]&&i.push(c[t][0]),c[t]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(l[r]=o[r]);for(s&&s(e);i.length;)i.shift()();return p.push.apply(p,u||[]),a()}function a(){for(var e,r=0;r<p.length;r++){for(var t=p[r],n=!0,o=1;o<t.length;o++){var u=t[o];0!==c[u]&&(n=!1)}n&&(p.splice(r--,1),e=f(f.s=t[0]))}return e}var t={},c={1:0},p=[];function f(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return l[e].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.m=l,f.c=t,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(r,e){if(1&e&&(r=f(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)f.d(t,n,function(e){return r[e]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="/";var r=this["webpackJsonpergo-node-interface"]=this["webpackJsonpergo-node-interface"]||[],n=r.push.bind(r);r.push=e,r=r.slice();for(var o=0;o<r.length;o++)e(r[o]);var s=n;a()}([])</script><script src="/static/js/2.403e76f2.chunk.js"></script><script src="/static/js/main.f279ca07.chunk.js"></script></body></html>
diff --git a/...ifest.ddd980e8a049b4769668bd1dbf7afa0f.js → ...ifest.f040045e0deb84c673ab57e20ec4cf2d.js b/...ifest.ddd980e8a049b4769668bd1dbf7afa0f.js → ...ifest.f040045e0deb84c673ab57e20ec4cf2d.js
@@ -1,23 +1,23 @@
 self.__precacheManifest = (self.__precacheManifest || []).concat([
   {
-    "revision": "b87d7a4bcb915152b1ff8c2c2ba8ecfa",
+    "revision": "513527f08eaf9fb338c88976990ef55f",
     "url": "/index.html"
   },
   {
     "revision": "8cf7d410052d09d9962c",
     "url": "/static/css/2.9338f6a1.chunk.css"
   },
   {
-    "revision": "bdef286d97bad7517b8a",
+    "revision": "dfb1c0beb16de7b5a66a",
     "url": "/static/css/main.0e9161bb.chunk.css"
   },
   {
     "revision": "8cf7d410052d09d9962c",
     "url": "/static/js/2.403e76f2.chunk.js"
   },
   {
-    "revision": "bdef286d97bad7517b8a",
-    "url": "/static/js/main.021e0207.chunk.js"
+    "revision": "dfb1c0beb16de7b5a66a",
+    "url": "/static/js/main.f279ca07.chunk.js"
   },
   {
     "revision": "ce813ebd69754efed759",

diff --git a/build/service-worker.js b/build/service-worker.js
@@ -14,7 +14,7 @@
 importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
 
 importScripts(
-  "/precache-manifest.ddd980e8a049b4769668bd1dbf7afa0f.js"
+  "/precache-manifest.f040045e0deb84c673ab57e20ec4cf2d.js"
 );
 
 self.addEventListener('message', (event) => {

diff --git a/build/static/js/main.021e0207.chunk.js b/build/static/js/main.021e0207.chunk.js
diff --git a/build/static/js/main.021e0207.chunk.js.map b/build/static/js/main.021e0207.chunk.js.map
diff --git a/build/static/js/main.f279ca07.chunk.js b/build/static/js/main.f279ca07.chunk.js
diff --git a/build/static/js/main.f279ca07.chunk.js.map b/build/static/js/main.f279ca07.chunk.js.map
diff --git a/src/components/Header/HeaderView.js b/src/components/Header/HeaderView.js
@@ -1,32 +1,35 @@
-import React, { memo } from 'react';
+import React, { memo, useState } from 'react';
 import { Navbar } from 'react-bootstrap';
 import { Link } from 'react-router-dom';
 import ApiKeyModal from './ApiKeyModal';
 import WalletStatusModal from './WalletStatusModal';
 import WalletInitModal from './WalletInitModal';
 import logo from '../../assets/images/logotype_white.svg';
+import { MODAL_STATES } from './utils';
 
-const renderWalletForms = (isWalletInitialized) => {
+const renderWalletForms = (isWalletInitialized, openedModal, setOpenedModal) => {
   if (isWalletInitialized === null) {
     return <></>;
   }
 
-  if (isWalletInitialized) {
+  if (isWalletInitialized && openedModal !== MODAL_STATES.INIT) {
     return (
       <div className="ml-4">
-        <WalletStatusModal />
+        <WalletStatusModal onOpen={setOpenedModal} />
       </div>
     );
   }
 
   return (
     <div className="ml-4">
-      <WalletInitModal />
+      <WalletInitModal onOpen={setOpenedModal} />
     </div>
   );
 };
 
 const HeaderView = ({ isApiKeySetted, isWalletInitialized }) => {
+  const [openedModal, setOpenedModal] = useState(null);
+
   return (
     <Navbar className="navbar-background" expand="lg">
       <Navbar.Brand className="navbar-brand">
@@ -37,7 +40,7 @@ const HeaderView = ({ isApiKeySetted, isWalletInitialized }) => {
       <div className="ml-4">
         <ApiKeyModal />
       </div>
-      {isApiKeySetted && renderWalletForms(isWalletInitialized)}
+      {isApiKeySetted && renderWalletForms(isWalletInitialized, openedModal, setOpenedModal)}
     </Navbar>
   );
 };

diff --git a/src/components/Header/WalletInitModal/index.js b/src/components/Header/WalletInitModal/index.js
@@ -6,6 +6,7 @@ import appActions from '../../../store/actions/appActions';
 import WalletInitializeForm from '../../elements/WalletInitializeForm';
 import RestoreWalletForm from '../../elements/RestoreWalletForm';
 import walletActions from '../../../store/actions/walletActions';
+import { MODAL_STATES } from '../utils';
 
 const mapStateToProps = (state) => ({
   apiKey: apiKeySelector(state),
@@ -22,10 +23,12 @@ class WalletInitModal extends Component {
   };
 
   handleShow = () => {
+    this.props.onOpen(MODAL_STATES.INIT);
     this.setState({ showModal: true });
   };
 
   handleHide = () => {
+    this.props.onOpen(null);
     this.props.dispatchCheckWalletStatus();
     this.setState({ showModal: false });
   };

diff --git a/src/components/Header/WalletStatusModal/index.js b/src/components/Header/WalletStatusModal/index.js
@@ -7,6 +7,7 @@ import walletActions from '../../../store/actions/walletActions';
 import { apiKeySelector } from '../../../store/selectors/app';
 import customToast from '../../../utils/toast';
 import nodeApi from '../../../api/api';
+import { MODAL_STATES } from '../utils';
 
 const mapStateToProps = (state) => ({
   isWalletUnlocked: isWalletUnlockedSelector(state),
@@ -24,10 +25,12 @@ class WalletStatusForm extends Component {
   };
 
   handleShow = () => {
+    this.props.onOpen(MODAL_STATES.STATUS);
     this.setState({ showModal: true });
   };
 
   handleHide = () => {
+    this.props.onOpen(null);
     this.setState({ showModal: false });
   };
 

diff --git a/src/components/Header/utils.js b/src/components/Header/utils.js
@@ -0,0 +1,4 @@
+export const MODAL_STATES = {
+  INIT: 'INIT',
+  STATUS: 'STATUS',
+};
diff --git a/src/components/pages/Dashboard/DashboardView.js b/src/components/pages/Dashboard/DashboardView.js
@@ -159,7 +159,7 @@ const DashboardView = ({
             {walletBalanceData && (
               <div className="dashboard__item">
                 <InfoCard className="rounded-0 shadow-none">
-                  <p className="info-card__title">Assets quantity</p>
+                  <p className="info-card__title">Assets</p>
                   <p className="info-card__label">
                     {Object.values(walletBalanceData.assets).length || '0'}
                   </p>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="/favicon.svg"/><meta name="viewport" content="minimum-scale=1,initial-scale=1,width=device-width,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="/manifest.json"/><title>Ergo node interface</title><link href="/static/css/2.9338f6a1.chunk.css" rel="stylesheet"><link href="/static/css/main.0e9161bb.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><div id="modal-root"></div><script>!function(l){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],f=0,i=[];f<n.length;f++)t=n[f],Object.prototype.hasOwnProperty.call(c,t)&&c[t]&&i.push(c[t][0]),c[t]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(l[r]=o[r]);for(s&&s(e);i.length;)i.shift()();return p.push.apply(p,u\|\|[]),a()}function a(){for(var e,r=0;r<p.length;r++){for(var t=p[r],n=!0,o=1;o<t.length;o++){var u=t[o];0!==c[u]&&(n=!1)}n&&(p.splice(r--,1),e=f(f.s=t[0]))}return e}var t={},c={1:0},p=[];function f(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return l[e].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.m=l,f.c=t,f.d=function(e,r,t){f.o(e,r)\|\|Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(r,e){if(1&e&&(r=f(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)f.d(t,n,function(e){return r[e]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="/";var r=this["webpackJsonpergo-node-interface"]=this["webpackJsonpergo-node-interface"]\|\|[],n=r.push.bind(r);r.push=e,r=r.slice();for(var o=0;o<r.length;o++)e(r[o]);var s=n;a()}([])</script><script src="/static/js/2.403e76f2.chunk.js"></script><script src="/static/js/main.021e0207.chunk.js"></script></body></html>
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="/favicon.svg"/><meta name="viewport" content="minimum-scale=1,initial-scale=1,width=device-width,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="/manifest.json"/><title>Ergo node interface</title><link href="/static/css/2.9338f6a1.chunk.css" rel="stylesheet"><link href="/static/css/main.0e9161bb.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><div id="modal-root"></div><script>!function(l){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],f=0,i=[];f<n.length;f++)t=n[f],Object.prototype.hasOwnProperty.call(c,t)&&c[t]&&i.push(c[t][0]),c[t]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(l[r]=o[r]);for(s&&s(e);i.length;)i.shift()();return p.push.apply(p,u\|\|[]),a()}function a(){for(var e,r=0;r<p.length;r++){for(var t=p[r],n=!0,o=1;o<t.length;o++){var u=t[o];0!==c[u]&&(n=!1)}n&&(p.splice(r--,1),e=f(f.s=t[0]))}return e}var t={},c={1:0},p=[];function f(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return l[e].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.m=l,f.c=t,f.d=function(e,r,t){f.o(e,r)\|\|Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(r,e){if(1&e&&(r=f(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)f.d(t,n,function(e){return r[e]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="/";var r=this["webpackJsonpergo-node-interface"]=this["webpackJsonpergo-node-interface"]\|\|[],n=r.push.bind(r);r.push=e,r=r.slice();for(var o=0;o<r.length;o++)e(r[o]);var s=n;a()}([])</script><script src="/static/js/2.403e76f2.chunk.js"></script><script src="/static/js/main.f279ca07.chunk.js"></script></body></html>