diff options
author | vantezzen <hello@vantezzen.io> | 2019-10-24 15:15:42 +0200 |
---|---|---|
committer | vantezzen <hello@vantezzen.io> | 2019-10-24 15:15:42 +0200 |
commit | 54f8b191a94bd78a85b046bbf21dd2245d3a6f3e (patch) | |
tree | ada5876f0e8a697ba4693bba07f5e0f31fea1fc9 /src/stores/UserStore.js | |
parent | Update submodules (diff) | |
parent | bump version to 5.4.0 (diff) | |
download | ferdium-app-54f8b191a94bd78a85b046bbf21dd2245d3a6f3e.tar.gz ferdium-app-54f8b191a94bd78a85b046bbf21dd2245d3a6f3e.tar.zst ferdium-app-54f8b191a94bd78a85b046bbf21dd2245d3a6f3e.zip |
Merge https://github.com/meetfranz/franz into franz-5.4.0-release
Diffstat (limited to 'src/stores/UserStore.js')
-rw-r--r-- | src/stores/UserStore.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js index 03aa79606..d6a2e5fde 100644 --- a/src/stores/UserStore.js +++ b/src/stores/UserStore.js | |||
@@ -78,6 +78,8 @@ export default class UserStore extends Store { | |||
78 | 78 | ||
79 | @observable logoutReason = null; | 79 | @observable logoutReason = null; |
80 | 80 | ||
81 | fetchUserInfoInterval = null; | ||
82 | |||
81 | constructor(...args) { | 83 | constructor(...args) { |
82 | super(...args); | 84 | super(...args); |
83 | 85 | ||
@@ -162,7 +164,7 @@ export default class UserStore extends Store { | |||
162 | } | 164 | } |
163 | 165 | ||
164 | @computed get isPremiumOverride() { | 166 | @computed get isPremiumOverride() { |
165 | return ((!this.team || !this.team.plan) && this.isPremium) || (this.team.state === 'expired' && this.isPremium); | 167 | return ((!this.team || !this.team.plan) && this.isPremium) || (this.team && this.team.state === 'expired' && this.isPremium); |
166 | } | 168 | } |
167 | 169 | ||
168 | @computed get isPersonal() { | 170 | @computed get isPersonal() { |
@@ -201,7 +203,7 @@ export default class UserStore extends Store { | |||
201 | } | 203 | } |
202 | 204 | ||
203 | @action async _signup({ | 205 | @action async _signup({ |
204 | firstname, lastname, email, password, accountType, company, | 206 | firstname, lastname, email, password, accountType, company, plan, currency, |
205 | }) { | 207 | }) { |
206 | const authToken = await this.signupRequest.execute({ | 208 | const authToken = await this.signupRequest.execute({ |
207 | firstname, | 209 | firstname, |
@@ -211,6 +213,8 @@ export default class UserStore extends Store { | |||
211 | accountType, | 213 | accountType, |
212 | company, | 214 | company, |
213 | locale: this.stores.app.locale, | 215 | locale: this.stores.app.locale, |
216 | plan, | ||
217 | currency, | ||
214 | }); | 218 | }); |
215 | 219 | ||
216 | this.hasCompletedSignup = true; | 220 | this.hasCompletedSignup = true; |