diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 193d585f..f5ed2c2f 100644 --- a/CONTRIBUTING.md +++ b/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 diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index d110cb6f..a6b0a150 100644 --- a/RELEASE-NOTES.md +++ b/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 diff --git a/package.json b/package.json index 7e87d4a1..ee117012 100644 --- a/package.json +++ b/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": { diff --git a/src/space.js b/src/space.js index a0280aed..2514ec50 100644 --- a/src/space.js +++ b/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 diff --git a/src/thread.js b/src/thread.js index 92031666..81d1e9d3 100644 --- a/src/thread.js +++ b/src/thread.js @@ -55,6 +55,7 @@ class Thread { accessController: this._accessController }, false)).toString() this._address = address + return this._address } /**