Merge https://github.com/meetfranz/franz into franz-5.4.0-release

3 files changed, 11 insertions, 1 deletions

diff --git a/src/actions/index.js b/src/actions/index.js
index 336344d76..9d3684edc 100644
--- a/src/actions/index.js
+++ b/src/actions/index.js
@@ -14,6 +14,8 @@ import requests from './requests';
 import announcements from '../features/announcements/actions';
 import workspaces from '../features/workspaces/actions';
 import todos from '../features/todos/actions';
+import planSelection from '../features/planSelection/actions';
+import trialStatusBar from '../features/trialStatusBar/actions';
 
 const actions = Object.assign({}, {
   service,
@@ -33,4 +35,6 @@ export default Object.assign(
   { announcements },
   { workspaces },
   { todos },
+  { planSelection },
+  { trialStatusBar },
 );
diff --git a/src/actions/payment.js b/src/actions/payment.js
index 2aaefc025..f61faf197 100644
--- a/src/actions/payment.js
+++ b/src/actions/payment.js
@@ -4,5 +4,9 @@ export default {
   createHostedPage: {
     planId: PropTypes.string.isRequired,
   },
+  upgradeAccount: {
+    planId: PropTypes.string.isRequired,
+    onCloseWindow: PropTypes.func,
+  },
   createDashboardUrl: {},
 };
diff --git a/src/actions/user.js b/src/actions/user.js
index 5d7d9a899..7061a367a 100644
--- a/src/actions/user.js
+++ b/src/actions/user.js
@@ -11,8 +11,10 @@ export default {
     lastname: PropTypes.string.isRequired,
     email: PropTypes.string.isRequired,
     password: PropTypes.string.isRequired,
-    accountType: PropTypes.string.isRequired,
+    accountType: PropTypes.string,
     company: PropTypes.string,
+    plan: PropTypes.string,
+    currency: PropTypes.string,
   },
   retrievePassword: {
     email: PropTypes.string.isRequired,