Merge pull request #544 from 3box/hotfix/v1.10.4

Hotfix/v1.10.4

CONTRIBUTING.md

@@ -7,8 +7,10 @@ To view the contribution guide, go to the main 3box repo here:
 
 ## Release checklist
 - [ ] Add release notes and update version in package.json
+- [ ] Run `$ npm run generate-readme`
 - [ ] Make sure correct dependencies are installed and that tests and builds pass
-- [ ] Create release branch `release/vX.X.X` and a PR to `master`
+- [ ] Create release branch `release/vX.X.X`
+- [ ] Make a commit `$ git commit -m "Release vX.X.X"` and make a PR to `master`
 - [ ] Get at least one review and merge
 - [ ] Checkout `master` locally
 - [ ] When tests pass on CI tag the version `$ git tag vX.X.X` and push

RELEASE-NOTES.md

@@ -1,5 +1,8 @@
 # Release Notes
 
+## v1.10.4 - 2019-07-31
+* fix: solved issue with joining multiple threads
+
 ## v1.10.3 - 2019-07-26
 * fix: resolves issue with portis and fortmatic web3 providers
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "3box",
-  "version": "1.10.3",
+  "version": "1.10.4",
   "description": "Interact with user data",
   "main": "lib/3box.js",
   "directories": {

src/space.js

@@ -78,7 +78,7 @@ class Space {
     const subscribeFn = opts.noAutoSub ? () => {} : this.subscribeThread.bind(this)
     if (!opts.firstModerator) opts.firstModerator = this._3id.getSubDID(this._name)
     const thread = new Thread(this._orbitdb, namesTothreadName(this._name, name), this._3id, opts.members, opts.firstModerator, subscribeFn, this._ensureConnected)
-    const address = thread._getThreadAddress()
+    const address = await thread._getThreadAddress()
     if (this._activeThreads[address]) return this._activeThreads[address]
     await thread._load()
     this._activeThreads[address] = thread

src/thread.js

@@ -55,6 +55,7 @@ class Thread {
       accessController: this._accessController
     }, false)).toString()
     this._address = address
+    return this._address
   }
 
   /**