Merge pull request #699 from 3box/release/1.4.0

Release/1.4.0
3box · Sep 21, 2020 · 7a637b3 · 7a637b3
2 parents 9276a84 + dfad657
commit 7a637b3
Show file tree

Hide file tree

Showing 9 changed files with 6,277 additions and 11,641 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,5 +1,8 @@
 # Release Notes
 
+## v1.3.0 - 2020-09-15
+* fix: upgrade 3box 1.22.1
+
 ## v1.3.0 - 2020-09-15
 * chore: upgrade 3box 1.22.0 and orbit db
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "3box-dapp",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "3box dapp",
   "private": true,
   "dependencies": {
-    "3box": "^1.22.0",
+    "3box": "^1.22.1",
     "3box-activity": "0.0.9",
     "3box-chatbox-react": "^0.1.9",
     "3id-resolver": "0.0.6",
@@ -27,7 +27,7 @@
     "fortmatic": "^1.1.3",
     "history": "^4.7.2",
     "idb-readable-stream": "0.0.4",
-    "ipfs-log": "^4.5.3",
+    "ipfs-log": "^4.6.5",
     "level-js": "^5.0.1",
     "levelup": "^4.4.0",
     "libp2p-pubsub": "0.4.6",

diff --git a/src/AppRoutes.jsx b/src/AppRoutes.jsx
@@ -22,7 +22,6 @@ import {
   Spaces,
   EditProfile,
   PubProfile,
-  Careers,
   Terms,
   Privacy,
   Settings,
@@ -78,19 +77,24 @@ const AppRoutes = (props) => {
 
       <Route
         exact
-        path={routes.CAREERS}
-        render={() => <Careers />}
+        path={routes.TEAM}
+        render={() => <Team />}
       />
       <Route
         exact
-        path={routes.TEAM}
-        render={() => <Team />}
+        path={routes.CAREERS}
+        render={() => {
+          window.location = 'https://jobs.lever.co/3box';
+          return null;
+        }}
       />
-
       <Route
         exact
         path={routes.JOBS}
-        render={() => <Redirect to={routes.CAREERS} />}
+        render={() => {
+          window.location = 'https://jobs.lever.co/3box';
+          return null;
+        }}
       />
 
       <Route

diff --git a/src/DynamicImports.jsx b/src/DynamicImports.jsx
@@ -73,13 +73,6 @@ export const NavLanding = (props) => (
   </DynamicImports>
 );
 
-export const Careers = (props) => (
-  <DynamicImports load={() => import('./views/Landing/Careers')}>
-    {Component => Component !== null
-      && <Component {...props} />}
-  </DynamicImports>
-);
-
 export const Terms = (props) => (
   <DynamicImports load={() => import('./views/Landing/Terms')}>
     {Component => Component !== null

diff --git a/src/state/actions/signin/openBox.js b/src/state/actions/signin/openBox.js
@@ -69,7 +69,8 @@ const openBox = (fromSignIn, fromFollowButton) => async (dispatch) => {
   }
 
   try {
-    const box = await Box.create(web3Obj.currentProvider, { ghostPinbot: "/dns4/pinbot.3box.io/wss/ipfs/QmRuz3UAiT1ubR2EXebWCJXnvMeVjcAfvsRLet482aFQip" });
+    const box = await Box.create(web3Obj.currentProvider, { disableRendezvous: true });
+    window.box = box
     const spaces = [followingSpaceName];
     await box.auth(spaces, {
       address: currentAddress,

diff --git a/src/views/Landing/Careers.jsx b/src/views/Landing/Careers.jsx
diff --git a/src/views/Landing/components/Footer.jsx b/src/views/Landing/components/Footer.jsx
@@ -64,9 +64,9 @@ const Footer = () => (
           <h5>
             MORE
           </h5>
-          <Link to={routes.CAREERS}>
+          <a href="https://jobs.lever.co/3box" target="_blank" rel="noopener noreferrer">
             Careers
-          </Link>
+          </a>
           <Link to={routes.TEAM}>
             Team
           </Link>
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,9 +64,9 @@ const Footer = () => ( @@
               <h5>
                 MORE
               </h5>
-              <Link to={routes.CAREERS}>
+              <a href="https://jobs.lever.co/3box" target="_blank" rel="noopener noreferrer">
                 Careers
-              </Link>
+              </a>
               <Link to={routes.TEAM}>
                 Team
               </Link>
@@ Expand Down @@