Merge branch 'bostrom-rc' of https://github.com/cybercongress/dot-cyber…

… into bostrom-rc

src/components/BandwidthBar/index.jsx

@@ -41,7 +41,7 @@ const ContentTooltip = ({ bwRemained, bwMaxValue, amounPower, countLink }) => {
       <Pane marginBottom={12}>
         <Text color="#fff" size={400}>
           {text}
-          <Link to="/portal">Get {CYBER.DENOM_CYBER.toUpperCase()}</Link>
+          <Link to="/search/get BOOT">Get {CYBER.DENOM_CYBER.toUpperCase()}</Link>
         </Text>
       </Pane>
     </Pane>

src/containers/application/AppMenu.jsx

@@ -14,8 +14,10 @@ import { Bookmarks } from '../../components/appMenu/AppMenu';
 
 const itemsMenu = (address) => {
   let linkAvatar = '/';
+  let linkBrain = '/graph';
   if (address !== null) {
     linkAvatar = `/network/bostrom/contract/${address.bech32}`;
+    linkBrain = `/pgraph/${address.bech32}`;
   }
   return [
     {
@@ -24,23 +26,46 @@ const itemsMenu = (address) => {
       subItems: [
         { name: 'Sixth Sense', to: '/sixthSense' },
         { name: 'Avatar', to: linkAvatar },
+        { name: 'Brain', to: linkBrain },
       ],
     },
     {
       name: 'Genesis',
       to: '/genesis',
+      subItems: [],
+    },
+    {
+      name: 'Portal',
+      to: '/search/portal',
       subItems: [
-        { name: 'BOOT', to: '/token/BOOT' },
-        { name: 'TOCYB', to: '/token/TOCYB' },
-        { name: 'CYB', to: '/token/CYB' },
+        { name: 'Manifest', to: '/search/manifest' },
+        // { name: 'Manifesto', to: '/portal' },
+        // { name: 'Leaderboard', to: '/portal/leaderboard' },
+        // { name: 'Progress', to: '/portal/progress' },
+        { name: 'Get Knowledge Back', to: '/portal/cyber-vs-corp' },
+        { name: 'Forget Governments', to: '/portal/cyber-vs-gov' },
       ],
     },
     {
-      name: 'Superintelligence',
-      to: '/superintelligence',
+      name: 'Bootloader',
+      to: '/bootloader',
       subItems: [
         { name: 'Transactions', to: '/network/bostrom/tx' },
         { name: 'Blocks', to: '/network/bostrom/block' },
+        { name: 'Thoughts', to: '/search/dmn' },
+        { name: 'Bostrom hub', to: '/search/bostrom' },
+        { name: 'BOOT token', to: '/token/BOOT' },
+      ],
+    },
+    {
+      name: 'Superintelligence',
+      to: '/search/superintelligence',
+      subItems: [
+        { name: 'Cyber the Knowledge', to: '/search/cyber' },
+        { name: 'Protocol Framework', to: '/search/computing knowledge' },
+        { name: 'Roadmap', to: '/search/cyber roadmap' },
+        { name: 'TOCYB token', to: '/token/TOCYB' },
+        { name: 'CYB token', to: '/token/CYB' },
       ],
     },
     {
@@ -50,17 +75,7 @@ const itemsMenu = (address) => {
         { name: 'Cyberlinks', to: '/graph' },
         { name: 'Particles', to: '/particles' },
         { name: 'Neurons', to: '/search/neurons' },
-      ],
-    },
-    {
-      name: 'Portal',
-      to: '/search/portal',
-      subItems: [
-        // { name: 'Manifesto', to: '/portal' },
-        // { name: 'Leaderboard', to: '/portal/leaderboard' },
-        // { name: 'Progress', to: '/portal/progress' },
-        { name: 'Cyber vs Corp', to: '/portal/cyber-vs-corp' },
-        { name: 'Cyber vs Gov', to: '/portal/cyber-vs-gov' },
+        { name: 'Relevance Machine', to: '/search/rm' },
       ],
     },
     {
@@ -70,18 +85,20 @@ const itemsMenu = (address) => {
         { name: 'Active heroes', to: '/halloffame' },
         { name: 'Heroes at rest', to: '/halloffame/jailed' },
         { name: 'Become a Hero', to: '/search/become hero' },
-        { name: 'BOOT', to: '/token/BOOT' },
+        { name: 'BOOT token', to: '/token/BOOT' },
         { name: 'Biosynthesis', to: '/search/biosynthesis reactor' },
-        { name: 'H', to: '/token/H' },
+        { name: 'H token', to: '/token/H' },
       ],
     },
     {
       name: 'HFR',
       to: '/search/hfr',
       subItems: [
         { name: 'Investmint', to: '/mint' },
-        { name: 'A', to: '/token/A' },
-        { name: 'V', to: '/token/V' },
+        { name: 'Bandwidth', to: '/search/bandwidth' },
+        { name: 'V token', to: '/token/V' },
+        { name: 'Ranking', to: '/search/ranking' },
+        { name: 'A token', to: '/token/A' },
       ],
     },
     {
@@ -108,8 +125,15 @@ const itemsMenu = (address) => {
       name: 'Great Web',
       to: '/search/great web',
       subItems: [
+        { name: 'Cyberlinks', to: '/search/cyberlink' },
+        { name: 'Particles', to: '/search/particle' },
+        { name: 'Neurons', to: '/search/neuron' },
+        { name: 'Semcons', to: '/search/semantic convention' },
+        { name: 'Cybernomics', to: '/search/cybernomics' },
+        { name: 'Earthish', to: '/search/earthish' },
+        { name: 'Kelvin Versioning', to: '/search/kelvin versioning' },
         { name: 'Foundation', to: '/search/greatweb foundation' },
-        { name: 'GOL', to: '/token/GOL' },
+        { name: 'GOL token', to: '/token/GOL' },
       ],
     },
     {
@@ -118,25 +142,31 @@ const itemsMenu = (address) => {
       active: false,
       subItems: [
         { name: 'Rating', to: '/nebula' },
-        { name: 'Create app', to: '/nebula/create app' },
-        { name: 'Deploy contract', to: '/nebula/deploy contract' },
-        { name: 'Give life', to: '/nebula/give life' },
+        { name: 'Create app', to: '/search/create app' },
+        { name: 'Deploy contract', to: '/search/deploy contract' },
+        { name: 'Give life', to: '/search/give life' },
       ],
     },
     {
       name: 'Senate',
       to: '/senate',
-      subItems: [],
+      subItems: [
+        { name: 'Process', to: '/search/cyber governance' },
+        { name: 'Evolution', to: '/search/cyber evolution' },
+        { name: 'Self-reflection', to: '/search/cyber self-reflection' },
+        { name: 'Investments', to: '/search/cyber investments' },
+        { name: 'Adaptation', to: '/search/cyber adaptation' },
+      ],
     },
     {
       name: 'Help',
       to: '/search/help',
       subItems: [],
     },
-  ];};
+  ];
+};
 
 const AppMenu = ({ addressActive }) => {
-  console.log(`addressActive`, addressActive)
   return (
     <MenuContainer>
       <Bookmarks items={itemsMenu(addressActive)} />

src/containers/application/application.jsx

@@ -31,8 +31,8 @@ const cyber = require('../../image/large-green.png');
 const cybFalse = require('../../image/cyb.svg');
 const cybTrue = require('../../image/cybTrue.svg');
 const bug = require('../../image/alert-circle-outline.svg');
-const circleRed = require('../../image/large-red-circle.png');
 const lensIcon = require('../../image/lens-icon.svg');
+const circleYellow = require('../../image/large-yellow-circle.png');
 
 const ListAccounts = ({
   accounts,
@@ -415,20 +415,24 @@ function App({
               tooltip={
                 <span>
                   <a
-                    target="_blank"
-                    rel="noopener noreferrer"
-                    href="https://github.com/cybercongress/dot-cyber"
+                    href="/search/cyb"
                   >
-                    The dot-cyber
+                    Cyb app
                   </a>{' '}
-                  app has not been audited yet. Please, use it with caution.
+                  has not been audited yet. Be especially careful when interracting with apps from search results! They can trick you with what you actually sign! {' '}
+                  <a
+                    href="/search/secure cyb"
+                  >
+                   Join the discussion {' '}
+                  </a>  
+                  on how to make apps in search results secure
                 </span>
               }
             >
               <img
                 alt="bugs"
-                style={{ width: '20px', height: '20px' }}
-                src={circleRed}
+                style={{ width: '15px', height: '15px' }}
+                src={circleYellow}
               />
             </Tooltip>
           </Pane>

src/containers/application/leftTooltip.jsx

@@ -22,18 +22,12 @@ function LeftTooltip({ block }) {
           </a>{' '}
           network at block{' '}
           <span style={{ color: '#4ed6ae' }}>
+            <a
+            href="/network/bostrom/block"
+            >
             {formatNumber(parseFloat(block))}
+            </a>
           </span>
-          . {CYBER.CHAIN_ID} is incentivized test network. Be careful. Details
-          in{' '}
-          <a
-            target="_blank"
-            rel="noopener noreferrer"
-            href="https://ipfs.io/ipfs/QmQ1Vong13MDNxixDyUdjniqqEj8sjuNEBYMyhQU4gQgq3"
-          >
-            whitepaper
-          </a>
-          .
         </span>
       }
     >

src/containers/genesis/index.jsx

@@ -3,12 +3,11 @@ import { connect } from 'react-redux';
 import Iframe from 'react-iframe';
 import Timer from './timer';
 
-function Genesis({ block }) {
+function Genesis() {
   const time = true;
 
   return (
     <div style={{ width: '100vw', height: '100vh' }}>
-      <div>{block}</div>
       {time ? (
         <Timer />
       ) : (
@@ -24,11 +23,4 @@ function Genesis({ block }) {
   );
 }
 
-const mapStateToProps = (store) => {
-  return {
-    block: store.block.block,
-  };
-};
-
-export default connect(mapStateToProps)(Genesis);
-// export default Genesis;
+export default Genesis;

src/router.jsx

@@ -217,7 +217,7 @@ function AppRouter({
       <Route path="/" component={App} />
       <Switch>
         <Route path="/" exact component={Wallet} />
-        <Route path="/superintelligence" component={Home} />
+        <Route path="/bootloader" component={Home} />
         <Route exact path="/search/:query" component={SearchResults} />
         <Route path="/gift/:address?" component={Gift} />
         <Route path="/gol/takeoff" component={Funding} />