Merge pull request #547 from DemocracyEarth/mobile

Version 0.9 release candidate
DemocracyEarth · Oct 24, 2020 · 324556b · 324556b
2 parents 5320ce9 + 21902bd
commit 324556b
Show file tree

Hide file tree

Showing 4 changed files with 116 additions and 1,240 deletions.
diff --git a/src/components/Account/Account.jsx b/src/components/Account/Account.jsx
@@ -7,7 +7,6 @@ import { Link } from 'react-router-dom';
 
 import { shortenCryptoName } from 'utils/strings';
 import Search, { includeInSearch } from 'components/Search/Search';
-import parser from 'html-react-parser';
 
 import i18n from 'i18n';
 import { config } from 'config'
@@ -87,7 +86,7 @@ const AccountQuery = ({ publicAddress, width, height, format, hidden }) => {
         {(format === 'searchBar') ?
           <Search />
           :
-          <div className="empty failure">{parser(i18n.t('failure-short', { errorMessage: error }))}</div>
+          null
         }
       </>
     );

diff --git a/src/components/DAO/DAO.jsx b/src/components/DAO/DAO.jsx
@@ -8,7 +8,6 @@ import { findLast } from 'lodash';
 import { gui } from 'lib/const';
 import { shortenCryptoName } from 'utils/strings';
 import Search, { includeInSearch } from 'components/Search/Search';
-import parser from 'html-react-parser';
 
 import i18n from 'i18n';
 import { config } from 'config'
@@ -44,7 +43,7 @@ const DAOQuery = ({ publicAddress, width, height, format }) => {
   if (loading) {
     return null;
   }
-  if (error) return <div className="empty failure">{parser(i18n.t('failure-short', { errorMessage: error }))}</div>;
+  if (error) return null /* <div className="empty failure">{parser(i18n.t('failure-short', { errorMessage: error }))}</div>; */
 
   const daoTitle = findLast(data.moloches, { id: publicAddress }).title;
   let label;

diff --git a/src/components/Dapp/Dapp.jsx b/src/components/Dapp/Dapp.jsx
@@ -58,6 +58,7 @@ const INITIAL_STATE = {
   showModal: false,
   pendingRequest: false,
   result: null,
+  mobile: (window.innerWidth < 768)
 };
 
 const routes = [
@@ -137,7 +138,6 @@ export default class Dapp extends Component {
       connected: true,
       address,
       networkId,
-      mobile: (window.innerWidth < 768)
     });
   }
 
@@ -198,7 +198,7 @@ export default class Dapp extends Component {
                     <Browser address={this.state.address} walletConnect={this.onConnect} walletReset={this.reset} />
                     <Layout address={this.state.address} />
                   </div>
-                  {(this.state.mobile) ?
+                  {(this.state.mobile || (window.innerWidth < 768)) ?
                     <Layout address={this.state.address} mobileMenu={true} />
                     :
                     null