@plusscommunities/pluss-core-web 1.2.4 → 1.2.8

package/dist/index.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@babel/runtime/helpers/toConsumableArray'), require('@babel/runtime/helpers/asyncToGenerator'), require('@babel/runtime/regenerator'), require('lodash'), require('axios'), require('aws-amplify'), require('@babel/runtime/helpers/defineProperty'), require('react'), require('moment'), require('jquery'), require('js-cookie'), require('@babel/runtime/helpers/classCallCheck'), require('@babel/runtime/helpers/createClass'), require('@babel/runtime/helpers/inherits'), require('@babel/runtime/helpers/possibleConstructorReturn'), require('@babel/runtime/helpers/getPrototypeOf'), require('react-fontawesome'), require('@babel/runtime/helpers/extends'), require('@babel/runtime/helpers/assertThisInitialized'), require('react-redux'), require('react-dropzone'), require('react-textarea-autosize'), require('react-router'), require('react-bootstrap'), require('@crello/react-lottie'), require('react-csv')) :
-  typeof define === 'function' && define.amd ? define(['exports', '@babel/runtime/helpers/toConsumableArray', '@babel/runtime/helpers/asyncToGenerator', '@babel/runtime/regenerator', 'lodash', 'axios', 'aws-amplify', '@babel/runtime/helpers/defineProperty', 'react', 'moment', 'jquery', 'js-cookie', '@babel/runtime/helpers/classCallCheck', '@babel/runtime/helpers/createClass', '@babel/runtime/helpers/inherits', '@babel/runtime/helpers/possibleConstructorReturn', '@babel/runtime/helpers/getPrototypeOf', 'react-fontawesome', '@babel/runtime/helpers/extends', '@babel/runtime/helpers/assertThisInitialized', 'react-redux', 'react-dropzone', 'react-textarea-autosize', 'react-router', 'react-bootstrap', '@crello/react-lottie', 'react-csv'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global['@plusscommunities/pluss-core-web'] = {}, global._toConsumableArray, global._asyncToGenerator, global._regeneratorRuntime, global._, global.axios, global.awsAmplify, global._defineProperty, global.React, global.moment, global.$, global.Cookies, global._classCallCheck, global._createClass, global._inherits, global._possibleConstructorReturn, global._getPrototypeOf, global.FontAwesome, global._extends, global._assertThisInitialized, global.reactRedux, global.Dropzone, global.Textarea, global.reactRouter, global.reactBootstrap, global.reactLottie, global.reactCsv));
-}(this, (function (exports, _toConsumableArray, _asyncToGenerator, _regeneratorRuntime, _, axios, awsAmplify, _defineProperty, React, moment, $, Cookies, _classCallCheck, _createClass, _inherits, _possibleConstructorReturn, _getPrototypeOf, FontAwesome, _extends, _assertThisInitialized, reactRedux, Dropzone, Textarea, reactRouter, reactBootstrap, reactLottie, reactCsv) { 'use strict';
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@babel/runtime/helpers/toConsumableArray'), require('@babel/runtime/helpers/asyncToGenerator'), require('@babel/runtime/regenerator'), require('lodash'), require('axios'), require('aws-amplify'), require('@babel/runtime/helpers/defineProperty'), require('react'), require('moment'), require('jquery'), require('js-cookie'), require('@babel/runtime/helpers/classCallCheck'), require('@babel/runtime/helpers/createClass'), require('@babel/runtime/helpers/inherits'), require('@babel/runtime/helpers/possibleConstructorReturn'), require('@babel/runtime/helpers/getPrototypeOf'), require('react-fontawesome'), require('@babel/runtime/helpers/extends'), require('@babel/runtime/helpers/assertThisInitialized'), require('react-redux'), require('react-textarea-autosize'), require('react-dropzone'), require('react-router'), require('react-bootstrap'), require('@crello/react-lottie'), require('react-csv')) :
+  typeof define === 'function' && define.amd ? define(['exports', '@babel/runtime/helpers/toConsumableArray', '@babel/runtime/helpers/asyncToGenerator', '@babel/runtime/regenerator', 'lodash', 'axios', 'aws-amplify', '@babel/runtime/helpers/defineProperty', 'react', 'moment', 'jquery', 'js-cookie', '@babel/runtime/helpers/classCallCheck', '@babel/runtime/helpers/createClass', '@babel/runtime/helpers/inherits', '@babel/runtime/helpers/possibleConstructorReturn', '@babel/runtime/helpers/getPrototypeOf', 'react-fontawesome', '@babel/runtime/helpers/extends', '@babel/runtime/helpers/assertThisInitialized', 'react-redux', 'react-textarea-autosize', 'react-dropzone', 'react-router', 'react-bootstrap', '@crello/react-lottie', 'react-csv'], factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global['@plusscommunities/pluss-core-web'] = {}, global._toConsumableArray, global._asyncToGenerator, global._regeneratorRuntime, global._, global.axios, global.awsAmplify, global._defineProperty, global.React, global.moment, global.$, global.Cookies, global._classCallCheck, global._createClass, global._inherits, global._possibleConstructorReturn, global._getPrototypeOf, global.FontAwesome, global._extends, global._assertThisInitialized, global.reactRedux, global.Textarea, global.Dropzone, global.reactRouter, global.reactBootstrap, global.reactLottie, global.reactCsv));
+}(this, (function (exports, _toConsumableArray, _asyncToGenerator, _regeneratorRuntime, _, axios, awsAmplify, _defineProperty, React, moment, $, Cookies, _classCallCheck, _createClass, _inherits, _possibleConstructorReturn, _getPrototypeOf, FontAwesome, _extends, _assertThisInitialized, reactRedux, Textarea, Dropzone, reactRouter, reactBootstrap, reactLottie, reactCsv) { 'use strict';
 
   function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -24,8 +24,8 @@
   var FontAwesome__default = /*#__PURE__*/_interopDefaultLegacy(FontAwesome);
   var _extends__default = /*#__PURE__*/_interopDefaultLegacy(_extends);
   var _assertThisInitialized__default = /*#__PURE__*/_interopDefaultLegacy(_assertThisInitialized);
-  var Dropzone__default = /*#__PURE__*/_interopDefaultLegacy(Dropzone);
   var Textarea__default = /*#__PURE__*/_interopDefaultLegacy(Textarea);
+  var Dropzone__default = /*#__PURE__*/_interopDefaultLegacy(Dropzone);
 
   var CoreConfig = {
     env: {
@@ -2986,14 +2986,14 @@
     setNavData: setNavData
   });
 
-  function _createSuper$y(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$y(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
+  function _createSuper$A(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$A(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
 
-  function _isNativeReflectConstruct$y() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+  function _isNativeReflectConstruct$A() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
   var AddButton = /*#__PURE__*/function (_Component) {
     _inherits__default['default'](AddButton, _Component);
 
-    var _super = _createSuper$y(AddButton);
+    var _super = _createSuper$A(AddButton);
 
     function AddButton() {
       _classCallCheck__default['default'](this, AddButton);
@@ -3970,14 +3970,14 @@
   	template_sportingClub: template_sportingClub
   };
 
-  function _createSuper$x(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$x(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
+  function _createSuper$z(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$z(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
 
-  function _isNativeReflectConstruct$x() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+  function _isNativeReflectConstruct$z() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
   var SVGIcon = /*#__PURE__*/function (_Component) {
     _inherits__default['default'](SVGIcon, _Component);
 
-    var _super = _createSuper$x(SVGIcon);
+    var _super = _createSuper$z(SVGIcon);
 
     function SVGIcon() {
       _classCallCheck__default['default'](this, SVGIcon);
@@ -4025,14 +4025,14 @@
     return SVGIcon;
   }(React.Component);
 
-  function _createSuper$w(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$w(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
+  function _createSuper$y(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$y(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
 
-  function _isNativeReflectConstruct$w() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+  function _isNativeReflectConstruct$y() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
   var Attachment = /*#__PURE__*/function (_Component) {
     _inherits__default['default'](Attachment, _Component);
 
-    var _super = _createSuper$w(Attachment);
+    var _super = _createSuper$y(Attachment);
 
     function Attachment() {
       _classCallCheck__default['default'](this, Attachment);
@@ -4070,14 +4070,14 @@
 
   function _objectSpread$e(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$e(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$e(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-  function _createSuper$v(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$v(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
+  function _createSuper$x(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$x(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
 
-  function _isNativeReflectConstruct$v() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+  function _isNativeReflectConstruct$x() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
   var Button = /*#__PURE__*/function (_Component) {
     _inherits__default['default'](Button, _Component);
 
-    var _super = _createSuper$v(Button);
+    var _super = _createSuper$x(Button);
 
     function Button() {
       _classCallCheck__default['default'](this, Button);
@@ -4177,14 +4177,14 @@
 
   function _objectSpread$d(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$d(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$d(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-  function _createSuper$u(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$u(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
+  function _createSuper$w(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$w(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
 
-  function _isNativeReflectConstruct$u() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+  function _isNativeReflectConstruct$w() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
   var CheckBox = /*#__PURE__*/function (_PureComponent) {
     _inherits__default['default'](CheckBox, _PureComponent);
 
-    var _super = _createSuper$u(CheckBox);
+    var _super = _createSuper$w(CheckBox);
 
     function CheckBox() {
       var _this;
@@ -4290,14 +4290,245 @@
     }
   };
 
+  function _createSuper$v(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$v(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
+
+  function _isNativeReflectConstruct$v() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
+  var Text = /*#__PURE__*/function (_Component) {
+    _inherits__default['default'](Text, _Component);
+
+    var _super = _createSuper$v(Text);
+
+    function Text() {
+      _classCallCheck__default['default'](this, Text);
+
+      return _super.apply(this, arguments);
+    }
+
+    _createClass__default['default'](Text, [{
+      key: "getClassName",
+      value: function getClassName() {
+        if (this.props.className) {
+          return " ".concat(this.props.className);
+        }
+
+        return '';
+      }
+    }, {
+      key: "render",
+      value: function render() {
+        return /*#__PURE__*/React__default['default'].createElement("p", {
+          className: "text-".concat(this.props.type).concat(this.getClassName()),
+          style: this.props.style
+        }, this.props.children);
+      }
+    }]);
+
+    return Text;
+  }(React.Component);
+
+  function ownKeys$c(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+  function _objectSpread$c(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$c(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$c(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+  function _createSuper$u(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$u(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
+
+  function _isNativeReflectConstruct$u() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
+  var ProfilePicComponent = /*#__PURE__*/function (_Component) {
+    _inherits__default['default'](ProfilePicComponent, _Component);
+
+    var _super = _createSuper$u(ProfilePicComponent);
+
+    function ProfilePicComponent() {
+      _classCallCheck__default['default'](this, ProfilePicComponent);
+
+      return _super.apply(this, arguments);
+    }
+
+    _createClass__default['default'](ProfilePicComponent, [{
+      key: "renderPic",
+      value: function renderPic() {
+        return /*#__PURE__*/React__default['default'].createElement("div", {
+          className: this.props.className,
+          style: _objectSpread$c({
+            width: this.props.size || 30,
+            height: this.props.size || 30,
+            borderRadius: this.props.size / 2 || 15,
+            backgroundColor: this.props.colourBrandingApp,
+            backgroundSize: 'cover',
+            backgroundPosition: 'center',
+            backgroundImage: "url(".concat(!___default['default'].isEmpty(this.props.image) ? this.props.image : CoreConfig.env.defaultProfileImage, ")")
+          }, this.props.style),
+          alt: "Profile Pic"
+        });
+      }
+    }, {
+      key: "render",
+      value: function render() {
+        if (this.props.hoverText) {
+          return /*#__PURE__*/React__default['default'].createElement("div", {
+            className: "profilePicHover ".concat(this.props.containerClass)
+          }, this.renderPic(), /*#__PURE__*/React__default['default'].createElement(Text, {
+            type: "h5",
+            className: "profilePicHover_text"
+          }, this.props.hoverText));
+        }
+
+        return this.renderPic();
+      }
+    }]);
+
+    return ProfilePicComponent;
+  }(React.Component);
+
+  var mapStateToProps$5 = function mapStateToProps(state) {
+    return {
+      colourBrandingApp: getAppColourFromState(state)
+    };
+  };
+
+  var ProfilePic = reactRedux.connect(mapStateToProps$5, {})(ProfilePicComponent);
+
   function _createSuper$t(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$t(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
 
   function _isNativeReflectConstruct$t() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
+  var Comment = /*#__PURE__*/function (_Component) {
+    _inherits__default['default'](Comment, _Component);
+
+    var _super = _createSuper$t(Comment);
+
+    function Comment() {
+      _classCallCheck__default['default'](this, Comment);
+
+      return _super.apply(this, arguments);
+    }
+
+    _createClass__default['default'](Comment, [{
+      key: "render",
+      value: function render() {
+        var comment = this.props.comment;
+        return /*#__PURE__*/React__default['default'].createElement("div", {
+          key: comment.Id,
+          className: "comment"
+        }, /*#__PURE__*/React__default['default'].createElement("p", {
+          className: "comment_text"
+        }, toParagraphed(comment.Comment)), /*#__PURE__*/React__default['default'].createElement("div", {
+          className: "comment_bottom"
+        }, /*#__PURE__*/React__default['default'].createElement(ProfilePic, {
+          className: "comment_profilePic",
+          size: 25,
+          image: comment.User.profilePic
+        }), /*#__PURE__*/React__default['default'].createElement("p", {
+          className: "comment_name"
+        }, comment.User.displayName), /*#__PURE__*/React__default['default'].createElement("p", {
+          className: "comment_time"
+        }, moment__default['default'].utc(comment.Timestamp).local().format('D MMM YYYY • h:mma'))));
+      }
+    }]);
+
+    return Comment;
+  }(React.Component);
+
+  function _createSuper$s(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$s(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
+
+  function _isNativeReflectConstruct$s() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
+  var CommentSection = /*#__PURE__*/function (_Component) {
+    _inherits__default['default'](CommentSection, _Component);
+
+    var _super = _createSuper$s(CommentSection);
+
+    function CommentSection(props) {
+      var _this;
+
+      _classCallCheck__default['default'](this, CommentSection);
+
+      _this = _super.call(this, props);
+
+      _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onHandleChange", function (event) {
+        var stateChange = {};
+        stateChange[event.target.getAttribute('id')] = event.target.value;
+
+        _this.setState(stateChange);
+      });
+
+      _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onAddComment", /*#__PURE__*/_asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
+        var commentInput;
+        return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                commentInput = _this.state.commentInput;
+
+                _this.setState({
+                  commentInput: ''
+                });
+
+                _this.props.onAddComment(commentInput);
+
+              case 3:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      })));
+
+      _this.state = {
+        commentInput: ''
+      };
+      return _this;
+    }
+
+    _createClass__default['default'](CommentSection, [{
+      key: "render",
+      value: function render() {
+        var _this2 = this;
+
+        return /*#__PURE__*/React__default['default'].createElement("div", null, this.props.includeTitle && /*#__PURE__*/React__default['default'].createElement(Text, {
+          type: "formTitleSmall",
+          className: "marginBottom-16"
+        }, "Comments"), /*#__PURE__*/React__default['default'].createElement("div", {
+          className: "commentSection"
+        }, this.props.comments.map(function (c) {
+          return /*#__PURE__*/React__default['default'].createElement(Comment, {
+            key: c.Id,
+            comment: c
+          });
+        })), /*#__PURE__*/React__default['default'].createElement("div", {
+          className: "commentReply"
+        }, /*#__PURE__*/React__default['default'].createElement("div", {
+          className: "commentReply_button".concat(!___default['default'].isEmpty(this.state.commentInput) ? ' commentReply_button-active' : ''),
+          onClick: this.onAddComment
+        }, /*#__PURE__*/React__default['default'].createElement(FontAwesome__default['default'], {
+          className: "commentReply_icon",
+          name: "paper-plane-o"
+        })), /*#__PURE__*/React__default['default'].createElement(Textarea__default['default'], {
+          id: "commentInput",
+          placeholder: "Reply here...",
+          type: "text",
+          className: "commentReply_input",
+          value: this.state.commentInput,
+          onChange: function onChange(e) {
+            return _this2.onHandleChange(e);
+          }
+        })));
+      }
+    }]);
+
+    return CommentSection;
+  }(React.Component);
+
+  function _createSuper$r(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$r(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
+
+  function _isNativeReflectConstruct$r() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
   var P60Icon = /*#__PURE__*/function (_Component) {
     _inherits__default['default'](P60Icon, _Component);
 
-    var _super = _createSuper$t(P60Icon);
+    var _super = _createSuper$r(P60Icon);
 
     function P60Icon() {
       var _this;
@@ -4353,14 +4584,14 @@
     return P60Icon;
   }(React.Component);
 
-  function _createSuper$s(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$s(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
+  function _createSuper$q(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$q(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
 
-  function _isNativeReflectConstruct$s() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+  function _isNativeReflectConstruct$q() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
   var DatePicker = /*#__PURE__*/function (_Component) {
     _inherits__default['default'](DatePicker, _Component);
 
-    var _super = _createSuper$s(DatePicker);
+    var _super = _createSuper$q(DatePicker);
 
     function DatePicker() {
       var _this;
@@ -4673,13 +4904,13 @@
     return DatePicker;
   }(React.Component);
 
-  function ownKeys$c(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+  function ownKeys$b(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-  function _objectSpread$c(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$c(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$c(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+  function _objectSpread$b(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$b(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$b(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-  function _createSuper$r(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$r(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
+  function _createSuper$p(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$p(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
 
-  function _isNativeReflectConstruct$r() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+  function _isNativeReflectConstruct$p() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
   var DEFAULT_INPUT$1 = {
     uploadingFile: false,
     value: ''
@@ -4688,7 +4919,7 @@
   var FileInputComponent = /*#__PURE__*/function (_Component) {
     _inherits__default['default'](FileInputComponent, _Component);
 
-    var _super = _createSuper$r(FileInputComponent);
+    var _super = _createSuper$p(FileInputComponent);
 
     function FileInputComponent() {
       var _this;
@@ -4743,7 +4974,7 @@
                 _this.handleFile(newInput, file);
               }
             } else {
-              var _newInput = _objectSpread$c({}, DEFAULT_INPUT$1);
+              var _newInput = _objectSpread$b({}, DEFAULT_INPUT$1);
 
               newInputs.splice(newInputs.length - 1, 0, _newInput);
 
@@ -4966,7 +5197,7 @@
               className: "imageInput_simpleContainer"
             }, /*#__PURE__*/React__default['default'].createElement("div", {
               className: "imageInput_image",
-              style: _objectSpread$c(_objectSpread$c({}, _this3.props.style), {}, {
+              style: _objectSpread$b(_objectSpread$b({}, _this3.props.style), {}, {
                 height: _this3.props.style && _this3.props.style.height ? _this3.props.style.height - 62 : 80
               })
             }, /*#__PURE__*/React__default['default'].createElement("img", {
@@ -4992,7 +5223,7 @@
 
           return /*#__PURE__*/React__default['default'].createElement("div", {
             className: "imageInput_image",
-            style: _objectSpread$c({}, _this3.props.style)
+            style: _objectSpread$b({}, _this3.props.style)
           });
         };
 
@@ -5023,12 +5254,12 @@
         return /*#__PURE__*/React__default['default'].createElement("div", {
           key: index,
           className: this.getClassNames(input, inputsLength),
-          style: _objectSpread$c({}, this.props.style)
+          style: _objectSpread$b({}, this.props.style)
         }, /*#__PURE__*/React__default['default'].createElement(Dropzone__default['default'], {
           className: "imageInput_upload ".concat(this.getErrorState()),
           accept: this.props.accept,
           onDrop: this.onDrop,
-          style: _objectSpread$c({}, this.props.style)
+          style: _objectSpread$b({}, this.props.style)
         }, function (_ref2) {
           var isDragActive = _ref2.isDragActive;
               _ref2.isDragReject;
@@ -5047,7 +5278,7 @@
           }, _this3.props.multiple ? "Upload files" : "Upload a file"));
         }), /*#__PURE__*/React__default['default'].createElement("div", {
           className: "imageInput_uploading",
-          style: _objectSpread$c({}, this.props.style)
+          style: _objectSpread$b({}, this.props.style)
         }, /*#__PURE__*/React__default['default'].createElement(FontAwesome__default['default'], {
           className: "spinner imageInput_spinner",
           name: "spinner fa-pulse fa-fw"
@@ -5060,7 +5291,7 @@
 
         return /*#__PURE__*/React__default['default'].createElement("div", {
           className: "imageInputContainer clearfix ".concat(inputs.length === 1 ? 'imageInputContainer-noPadding' : '', " ").concat(this.props.simpleStyle ? 'imageInputContainer-simple' : ''),
-          style: _objectSpread$c({}, this.props.style)
+          style: _objectSpread$b({}, this.props.style)
         }, inputs.map(function (input, index) {
           return _this4.renderInput(input, index, inputs.length);
         }));
@@ -5082,26 +5313,26 @@
     return FileInputComponent;
   }(React.Component);
 
-  var mapStateToProps$5 = function mapStateToProps() {
+  var mapStateToProps$4 = function mapStateToProps() {
     return {};
   };
 
-  var FileInput = reactRedux.connect(mapStateToProps$5, {}, null, {
+  var FileInput = reactRedux.connect(mapStateToProps$4, {}, null, {
     withRef: true
   })(FileInputComponent);
 
-  function ownKeys$b(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+  function ownKeys$a(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-  function _objectSpread$b(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$b(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$b(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+  function _objectSpread$a(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$a(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$a(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-  function _createSuper$q(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$q(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
+  function _createSuper$o(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$o(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
 
-  function _isNativeReflectConstruct$q() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+  function _isNativeReflectConstruct$o() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
   var GenericInput = /*#__PURE__*/function (_Component) {
     _inherits__default['default'](GenericInput, _Component);
 
-    var _super = _createSuper$q(GenericInput);
+    var _super = _createSuper$o(GenericInput);
 
     function GenericInput() {
       _classCallCheck__default['default'](this, GenericInput);
@@ -5206,7 +5437,7 @@
 
         if (!___default['default'].isUndefined(this.props.inputComponent)) {
           return /*#__PURE__*/React__default['default'].createElement("div", {
-            style: _objectSpread$b(_objectSpread$b({}, styles$7.row), {}, {
+            style: _objectSpread$a(_objectSpread$a({}, styles$7.row), {}, {
               alignItems: 'flex-start'
             })
           }, this.props.isRequired && /*#__PURE__*/React__default['default'].createElement("div", {
@@ -5217,7 +5448,7 @@
         if (!___default['default'].isUndefined(this.props.type) && this.props.type === 'textarea') {
           // Render expandable text area
           return /*#__PURE__*/React__default['default'].createElement("div", {
-            style: _objectSpread$b(_objectSpread$b({}, styles$7.row), {}, {
+            style: _objectSpread$a(_objectSpread$a({}, styles$7.row), {}, {
               alignItems: 'flex-start'
             })
           }, this.props.isRequired && /*#__PURE__*/React__default['default'].createElement("div", {
@@ -5231,7 +5462,7 @@
             onChange: this.props.onChange,
             onKeyPress: this.props.onKeyPress || this.props.onEnter,
             onKeyDown: this.props.onKeyDown,
-            style: _objectSpread$b({}, this.props.inputStyle),
+            style: _objectSpread$a({}, this.props.inputStyle),
             readOnly: !___default['default'].isUndefined(this.props.readOnly) ? this.props.readOnly : false,
             disabled: !___default['default'].isUndefined(this.props.disabled) ? this.props.disabled : false,
             autoComplete: this.getAutoComplete(),
@@ -5243,7 +5474,7 @@
 
 
         return /*#__PURE__*/React__default['default'].createElement("div", {
-          style: _objectSpread$b(_objectSpread$b({}, styles$7.row), this.props.textWrapperStyle)
+          style: _objectSpread$a(_objectSpread$a({}, styles$7.row), this.props.textWrapperStyle)
         }, this.props.isRequired && /*#__PURE__*/React__default['default'].createElement("div", {
           className: "inputRequired "
         }), /*#__PURE__*/React__default['default'].createElement("input", {
@@ -5259,7 +5490,7 @@
           onClick: this.props.onClick,
           onKeyPress: this.props.onKeyPress || this.props.onEnter,
           onKeyDown: this.props.onKeyDown,
-          style: _objectSpread$b({}, this.props.inputStyle),
+          style: _objectSpread$a({}, this.props.inputStyle),
           readOnly: !___default['default'].isUndefined(this.props.readOnly) ? this.props.readOnly : false,
           disabled: !___default['default'].isUndefined(this.props.disabled) ? this.props.disabled : false,
           autoComplete: this.getAutoComplete(),
@@ -5274,9 +5505,9 @@
       value: function render() {
         return /*#__PURE__*/React__default['default'].createElement("div", {
           className: this.getClassNames(),
-          style: _objectSpread$b({}, this.props.style)
+          style: _objectSpread$a({}, this.props.style)
         }, /*#__PURE__*/React__default['default'].createElement("div", {
-          style: _objectSpread$b(_objectSpread$b({}, styles$7.row), {}, {
+          style: _objectSpread$a(_objectSpread$a({}, styles$7.row), {}, {
             marginBottom: 0,
             justifyContent: 'space-between'
           })
@@ -5299,14 +5530,14 @@
     }
   };
 
-  function _createSuper$p(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$p(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
+  function _createSuper$n(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$n(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
 
-  function _isNativeReflectConstruct$p() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+  function _isNativeReflectConstruct$n() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
   var Header = /*#__PURE__*/function (_Component) {
     _inherits__default['default'](Header, _Component);
 
-    var _super = _createSuper$p(Header);
+    var _super = _createSuper$n(Header);
 
     function Header() {
       var _this;
@@ -5413,29 +5644,29 @@
     return Header;
   }(React.Component);
 
-  var mapStateToProps$4 = function mapStateToProps(state) {
+  var mapStateToProps$3 = function mapStateToProps(state) {
     return {
       auth: state.auth,
       isSideMenuOpen: state.nav.isSideMenuOpen
     };
   };
 
-  var exportObj$2 = reactRedux.connect(mapStateToProps$4, {
+  var exportObj$2 = reactRedux.connect(mapStateToProps$3, {
     setNavData: setNavData
   })(reactRouter.withRouter(Header));
 
-  function ownKeys$a(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+  function ownKeys$9(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-  function _objectSpread$a(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$a(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$a(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+  function _objectSpread$9(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$9(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$9(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-  function _createSuper$o(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$o(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
+  function _createSuper$m(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$m(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
 
-  function _isNativeReflectConstruct$o() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+  function _isNativeReflectConstruct$m() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
   var Popup = /*#__PURE__*/function (_Component) {
     _inherits__default['default'](Popup, _Component);
 
-    var _super = _createSuper$o(Popup);
+    var _super = _createSuper$m(Popup);
 
     function Popup() {
       _classCallCheck__default['default'](this, Popup);
@@ -5493,7 +5724,7 @@
             return /*#__PURE__*/React__default['default'].createElement(Button, {
               key: index,
               buttonType: b.type,
-              style: _objectSpread$a({
+              style: _objectSpread$9({
                 marginLeft: 8,
                 marginRight: 8
               }, b.style),
@@ -5512,7 +5743,7 @@
           return /*#__PURE__*/React__default['default'].createElement(Button, {
             key: index,
             buttonType: b.type,
-            style: _objectSpread$a({
+            style: _objectSpread$9({
               marginLeft: 16
             }, b.style),
             className: b.className,
@@ -5545,13 +5776,13 @@
     return Popup;
   }(React.Component);
 
-  function ownKeys$9(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+  function ownKeys$8(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-  function _objectSpread$9(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$9(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$9(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+  function _objectSpread$8(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$8(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$8(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-  function _createSuper$n(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$n(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
+  function _createSuper$l(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$l(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
 
-  function _isNativeReflectConstruct$n() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+  function _isNativeReflectConstruct$l() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
   var DEFAULT_INPUT = {
     uploadingImage: false,
     value: '',
@@ -5561,7 +5792,7 @@
   var ImageInputComponent = /*#__PURE__*/function (_Component) {
     _inherits__default['default'](ImageInputComponent, _Component);
 
-    var _super = _createSuper$n(ImageInputComponent);
+    var _super = _createSuper$l(ImageInputComponent);
 
     function ImageInputComponent() {
       var _this;
@@ -5692,7 +5923,7 @@
                 case 5:
                   folders = _context2.sent;
 
-                  _this.setState(_objectSpread$9({
+                  _this.setState(_objectSpread$8({
                     addingFolder: false,
                     folders: folders
                   }, _this.cancelAddStates));
@@ -5757,7 +5988,7 @@
                 _this.handleFile(newInput, file);
               }
             } else {
-              var _newInput = _objectSpread$9(_objectSpread$9({}, DEFAULT_INPUT), {}, {
+              var _newInput = _objectSpread$8(_objectSpread$8({}, DEFAULT_INPUT), {}, {
                 fromLibrary: fromLibrary
               });
 
@@ -5860,11 +6091,11 @@
         event.stopPropagation();
 
         if (window.confirm("Are you sure you want to delete ".concat(folder.Name, "?"))) {
-          var deletingFolder = _objectSpread$9({}, _this.state.deletingFolder);
+          var deletingFolder = _objectSpread$8({}, _this.state.deletingFolder);
 
           deletingFolder[folder.RowId] = true;
 
-          _this.setState(_objectSpread$9({
+          _this.setState(_objectSpread$8({
             deletingFolder: ___default['default'].clone(deletingFolder)
           }, _this.cancelAddStates), /*#__PURE__*/_asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4() {
             var folders;
@@ -5917,7 +6148,7 @@
           // Unselect the image first if selected
           if (image.Selected) _this.toggleLibraryItem(image);
 
-          var deletingImage = _objectSpread$9({}, _this.state.deletingImage);
+          var deletingImage = _objectSpread$8({}, _this.state.deletingImage);
 
           deletingImage[image.Value] = true;
 
@@ -6378,7 +6609,7 @@
               className: "imageInput_simpleContainer"
             }, /*#__PURE__*/React__default['default'].createElement("div", {
               className: "imageInput_image",
-              style: _objectSpread$9(_objectSpread$9({}, _this6.getImageStyle(input.displayValue)), _this6.props.style)
+              style: _objectSpread$8(_objectSpread$8({}, _this6.getImageStyle(input.displayValue)), _this6.props.style)
             }, /*#__PURE__*/React__default['default'].createElement(Dropzone__default['default'], {
               accept: "image/jpeg, image/png".concat(_this6.props.allowVideo ? ', video/*' : ''),
               onDrop: function onDrop(files) {
@@ -6394,7 +6625,7 @@
 
           return /*#__PURE__*/React__default['default'].createElement("div", {
             className: "imageInput_image",
-            style: _objectSpread$9(_objectSpread$9({}, _this6.getImageStyle(input.displayValue)), _this6.props.style)
+            style: _objectSpread$8(_objectSpread$8({}, _this6.getImageStyle(input.displayValue)), _this6.props.style)
           });
         };
 
@@ -6427,12 +6658,12 @@
         return /*#__PURE__*/React__default['default'].createElement("div", {
           key: index,
           className: this.getClassNames(input, inputsLength),
-          style: _objectSpread$9({}, this.props.style)
+          style: _objectSpread$8({}, this.props.style)
         }, /*#__PURE__*/React__default['default'].createElement(Dropzone__default['default'], {
           className: "imageInput_upload ".concat(this.getErrorState()),
           accept: "image/jpeg, image/png".concat(this.props.allowVideo ? ', video/*' : ''),
           onDrop: this.onDrop,
-          style: _objectSpread$9({}, this.props.style)
+          style: _objectSpread$8({}, this.props.style)
         }, function (_ref8) {
           var isDragActive = _ref8.isDragActive;
               _ref8.isDragReject;
@@ -6451,7 +6682,7 @@
           }, _this6.props.multiple ? "Upload ".concat(mediaText) : "Upload an ".concat(mediaText)));
         }), /*#__PURE__*/React__default['default'].createElement("div", {
           className: "imageInput_uploading",
-          style: _objectSpread$9({}, this.props.style)
+          style: _objectSpread$8({}, this.props.style)
         }, /*#__PURE__*/React__default['default'].createElement(FontAwesome__default['default'], {
           className: "spinner imageInput_spinner",
           name: "spinner fa-pulse fa-fw"
@@ -6477,7 +6708,7 @@
           className: classes
         }, /*#__PURE__*/React__default['default'].createElement("div", {
           className: "imageInput_image",
-          style: _objectSpread$9({}, this.getImageStyle(image[1400])),
+          style: _objectSpread$8({}, this.getImageStyle(image[1400])),
           onClick: this.toggleLibraryItem.bind(this, image)
         }), /*#__PURE__*/React__default['default'].createElement("div", {
           className: "imageInput_selected"
@@ -6670,7 +6901,7 @@
         var mediaText = this.props.allowVideo ? 'media' : "image".concat(this.props.multiple ? 's' : '');
         return /*#__PURE__*/React__default['default'].createElement("div", {
           className: "imageInputContainer imageInputContainer-library",
-          style: _objectSpread$9({}, this.props.style)
+          style: _objectSpread$8({}, this.props.style)
         }, this.renderBreadCrumbs(), stockFolder ? this.state.imageLibrary.map(function (image, index) {
           return _this12.renderLibraryImage(image, index);
         }) : /*#__PURE__*/React__default['default'].createElement("div", null, this.canAddImageToLibrary() && /*#__PURE__*/React__default['default'].createElement(Dropzone__default['default'], {
@@ -6719,7 +6950,7 @@
 
         return /*#__PURE__*/React__default['default'].createElement("div", {
           className: "imageInputContainer ".concat(inputs.length === 1 ? 'imageInputContainer-noPadding' : ''),
-          style: _objectSpread$9({}, this.props.style)
+          style: _objectSpread$8({}, this.props.style)
         }, inputs.map(function (input, index) {
           return _this13.renderInput(input, index, inputs.length);
         }));
@@ -6844,24 +7075,24 @@
     }
   };
 
-  var mapStateToProps$3 = function mapStateToProps(state) {
+  var mapStateToProps$2 = function mapStateToProps(state) {
     return {
       auth: state.auth
     };
   };
 
-  var ImageInput = reactRedux.connect(mapStateToProps$3, {}, null, {
+  var ImageInput = reactRedux.connect(mapStateToProps$2, {}, null, {
     withRef: true
   })(ImageInputComponent);
 
-  function _createSuper$m(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$m(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
+  function _createSuper$k(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$k(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
 
-  function _isNativeReflectConstruct$m() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+  function _isNativeReflectConstruct$k() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
   var MoreMenu = /*#__PURE__*/function (_Component) {
     _inherits__default['default'](MoreMenu, _Component);
 
-    var _super = _createSuper$m(MoreMenu);
+    var _super = _createSuper$k(MoreMenu);
 
     function MoreMenu() {
       _classCallCheck__default['default'](this, MoreMenu);
@@ -6891,18 +7122,18 @@
     return MoreMenu;
   }(React.Component);
 
-  function ownKeys$8(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+  function ownKeys$7(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-  function _objectSpread$8(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$8(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$8(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+  function _objectSpread$7(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$7(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$7(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-  function _createSuper$l(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$l(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
+  function _createSuper$j(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$j(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
 
-  function _isNativeReflectConstruct$l() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+  function _isNativeReflectConstruct$j() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
   var OverlayPage = /*#__PURE__*/function (_Component) {
     _inherits__default['default'](OverlayPage, _Component);
 
-    var _super = _createSuper$l(OverlayPage);
+    var _super = _createSuper$j(OverlayPage);
 
     function OverlayPage(props) {
       var _this;
@@ -6955,9 +7186,9 @@
       key: "render",
       value: function render() {
         return /*#__PURE__*/React__default['default'].createElement("div", {
-          style: _objectSpread$8(_objectSpread$8({}, styles$5.pageWrapper), this.props.style)
+          style: _objectSpread$7(_objectSpread$7({}, styles$5.pageWrapper), this.props.style)
         }, /*#__PURE__*/React__default['default'].createElement("div", {
-          style: _objectSpread$8(_objectSpread$8({}, styles$5.backgroundOverlay), this.props.backgroundStyle)
+          style: _objectSpread$7(_objectSpread$7({}, styles$5.backgroundOverlay), this.props.backgroundStyle)
         }), this.renderContent());
       }
     }]);
@@ -6984,18 +7215,18 @@
     }
   };
 
-  function ownKeys$7(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+  function ownKeys$6(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-  function _objectSpread$7(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$7(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$7(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+  function _objectSpread$6(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$6(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$6(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-  function _createSuper$k(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$k(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
+  function _createSuper$i(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$i(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
 
-  function _isNativeReflectConstruct$k() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+  function _isNativeReflectConstruct$i() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
   var OverlayPageContents = /*#__PURE__*/function (_Component) {
     _inherits__default['default'](OverlayPageContents, _Component);
 
-    var _super = _createSuper$k(OverlayPageContents);
+    var _super = _createSuper$i(OverlayPageContents);
 
     function OverlayPageContents(props) {
       var _this;
@@ -7026,7 +7257,7 @@
         return /*#__PURE__*/React__default['default'].createElement("div", {
           id: this.props.id,
           className: "animateOpacity",
-          style: _objectSpread$7(_objectSpread$7({}, styles$4.wrapper), {}, {
+          style: _objectSpread$6(_objectSpread$6({}, styles$4.wrapper), {}, {
             height: this.props.noBottomButtons ? '100%' : 'calc(100% - 57px)',
             opacity: this.state.opacity
           }, this.props.style)
@@ -7050,18 +7281,18 @@
     }
   };
 
-  function ownKeys$6(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+  function ownKeys$5(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-  function _objectSpread$6(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$6(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$6(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+  function _objectSpread$5(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$5(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$5(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-  function _createSuper$j(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$j(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
+  function _createSuper$h(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$h(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
 
-  function _isNativeReflectConstruct$j() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+  function _isNativeReflectConstruct$h() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
   var OverlayPageSection = /*#__PURE__*/function (_Component) {
     _inherits__default['default'](OverlayPageSection, _Component);
 
-    var _super = _createSuper$j(OverlayPageSection);
+    var _super = _createSuper$h(OverlayPageSection);
 
     function OverlayPageSection() {
       _classCallCheck__default['default'](this, OverlayPageSection);
@@ -7083,7 +7314,7 @@
       value: function render() {
         return /*#__PURE__*/React__default['default'].createElement("div", _extends__default['default']({}, this.props, {
           className: this.getClassName(),
-          style: _objectSpread$6(_objectSpread$6({}, styles$3.wrapper), this.props.style)
+          style: _objectSpread$5(_objectSpread$5({}, styles$3.wrapper), this.props.style)
         }), this.props.children);
       }
     }]);
@@ -7102,18 +7333,18 @@
     }
   };
 
-  function ownKeys$5(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+  function ownKeys$4(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
-  function _objectSpread$5(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$5(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$5(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+  function _objectSpread$4(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$4(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$4(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-  function _createSuper$i(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$i(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
+  function _createSuper$g(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$g(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
 
-  function _isNativeReflectConstruct$i() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+  function _isNativeReflectConstruct$g() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
   var OverlayPageBottomButtons = /*#__PURE__*/function (_Component) {
     _inherits__default['default'](OverlayPageBottomButtons, _Component);
 
-    var _super = _createSuper$i(OverlayPageBottomButtons);
+    var _super = _createSuper$g(OverlayPageBottomButtons);
 
     function OverlayPageBottomButtons(props) {
       var _this;
@@ -7143,7 +7374,7 @@
       value: function render() {
         return /*#__PURE__*/React__default['default'].createElement("div", {
           className: "animateOpacity",
-          style: _objectSpread$5(_objectSpread$5({}, styles$2.wrapper), {}, {
+          style: _objectSpread$4(_objectSpread$4({}, styles$2.wrapper), {}, {
             opacity: this.state.opacity
           }, this.props.style)
         }, this.props.children);
@@ -7167,14 +7398,14 @@
     }
   };
 
-  function _createSuper$h(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$h(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
+  function _createSuper$f(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$f(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
 
-  function _isNativeReflectConstruct$h() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+  function _isNativeReflectConstruct$f() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
   var PageTitle = /*#__PURE__*/function (_Component) {
     _inherits__default['default'](PageTitle, _Component);
 
-    var _super = _createSuper$h(PageTitle);
+    var _super = _createSuper$f(PageTitle);
 
     function PageTitle() {
       _classCallCheck__default['default'](this, PageTitle);
@@ -7194,106 +7425,6 @@
     return PageTitle;
   }(React.Component);
 
-  function _createSuper$g(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$g(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
-
-  function _isNativeReflectConstruct$g() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
-  var Text = /*#__PURE__*/function (_Component) {
-    _inherits__default['default'](Text, _Component);
-
-    var _super = _createSuper$g(Text);
-
-    function Text() {
-      _classCallCheck__default['default'](this, Text);
-
-      return _super.apply(this, arguments);
-    }
-
-    _createClass__default['default'](Text, [{
-      key: "getClassName",
-      value: function getClassName() {
-        if (this.props.className) {
-          return " ".concat(this.props.className);
-        }
-
-        return '';
-      }
-    }, {
-      key: "render",
-      value: function render() {
-        return /*#__PURE__*/React__default['default'].createElement("p", {
-          className: "text-".concat(this.props.type).concat(this.getClassName()),
-          style: this.props.style
-        }, this.props.children);
-      }
-    }]);
-
-    return Text;
-  }(React.Component);
-
-  function ownKeys$4(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-  function _objectSpread$4(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$4(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$4(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-  function _createSuper$f(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct$f(); return function _createSuperInternal() { var Super = _getPrototypeOf__default['default'](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default['default'](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default['default'](this, result); }; }
-
-  function _isNativeReflectConstruct$f() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
-  var ProfilePicComponent = /*#__PURE__*/function (_Component) {
-    _inherits__default['default'](ProfilePicComponent, _Component);
-
-    var _super = _createSuper$f(ProfilePicComponent);
-
-    function ProfilePicComponent() {
-      _classCallCheck__default['default'](this, ProfilePicComponent);
-
-      return _super.apply(this, arguments);
-    }
-
-    _createClass__default['default'](ProfilePicComponent, [{
-      key: "renderPic",
-      value: function renderPic() {
-        return /*#__PURE__*/React__default['default'].createElement("div", {
-          className: this.props.className,
-          style: _objectSpread$4({
-            width: this.props.size || 30,
-            height: this.props.size || 30,
-            borderRadius: this.props.size / 2 || 15,
-            backgroundColor: this.props.colourBrandingApp,
-            backgroundSize: 'cover',
-            backgroundPosition: 'center',
-            backgroundImage: "url(".concat(!___default['default'].isEmpty(this.props.image) ? this.props.image : CoreConfig.env.defaultProfileImage, ")")
-          }, this.props.style),
-          alt: "Profile Pic"
-        });
-      }
-    }, {
-      key: "render",
-      value: function render() {
-        if (this.props.hoverText) {
-          return /*#__PURE__*/React__default['default'].createElement("div", {
-            className: "profilePicHover ".concat(this.props.containerClass)
-          }, this.renderPic(), /*#__PURE__*/React__default['default'].createElement(Text, {
-            type: "h5",
-            className: "profilePicHover_text"
-          }, this.props.hoverText));
-        }
-
-        return this.renderPic();
-      }
-    }]);
-
-    return ProfilePicComponent;
-  }(React.Component);
-
-  var mapStateToProps$2 = function mapStateToProps(state) {
-    return {
-      colourBrandingApp: getAppColourFromState(state)
-    };
-  };
-
-  var ProfilePic = reactRedux.connect(mapStateToProps$2, {})(ProfilePicComponent);
-
   function ownKeys$3(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
   function _objectSpread$3(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys$3(Object(source), true).forEach(function (key) { _defineProperty__default['default'](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys$3(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -8697,42 +8828,22 @@
 
     var _super = _createSuper$4(AudienceSelector);
 
-    function AudienceSelector() {
+    function AudienceSelector(props) {
       var _this;
 
       _classCallCheck__default['default'](this, AudienceSelector);
 
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
-      }
+      _this = _super.call(this, props);
 
-      _this = _super.call.apply(_super, [this].concat(args));
+      _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onChangeSelection", function () {
+        var _this$props = _this.props,
+            updateValidation = _this$props.updateValidation,
+            onChange = _this$props.onChange;
 
-      _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "state", {
-        categories: [{
-          Title: 'All Primary Users',
-          Key: 'resident',
-          ShortName: 'Primary'
-        }, {
-          Title: 'All Staff Users',
-          Key: 'staff',
-          ShortName: 'Staff'
-        }, {
-          Title: 'All Linked Users',
-          Key: 'family',
-          ShortName: 'Linked'
-        }],
-        types: [],
-        AudienceType: 'All',
-        showInclude: false,
-        includeList: [],
-        showExclude: false,
-        excludeList: [],
-        Type: '',
-        Category: '',
-        userList: [],
-        tagList: [],
-        AudienceTagList: []
+        var isValid = _this.validateAudienceSelection();
+
+        if (updateValidation) updateValidation(isValid);
+        if (onChange) onChange(_this.getAudienceType(), _this.getAudienceTypeSelection(), isValid);
       });
 
       _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "selectTag", function (key) {
@@ -8742,9 +8853,7 @@
           excludeList: []
         });
 
-        setTimeout(function () {
-          _this.props.updateValidation(_this.validateAudienceSelection());
-        }, 50);
+        setTimeout(_this.onChangeSelection, 50);
       });
 
       _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "validateCustom", function () {
@@ -8752,6 +8861,7 @@
       });
 
       _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "getAvailableAudienceTags", function () {
+        var includeSelected = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
         var _this$state = _this.state,
             categories = _this$state.categories,
             types = _this$state.types,
@@ -8781,7 +8891,8 @@
             Title: "User Tag: ".concat(t.Title)
           };
         });
-        return [].concat(_toConsumableArray__default['default'](categoryTags), _toConsumableArray__default['default'](userTypeTags), _toConsumableArray__default['default'](userTagTags)).filter(function (t) {
+        var result = [].concat(_toConsumableArray__default['default'](categoryTags), _toConsumableArray__default['default'](userTypeTags), _toConsumableArray__default['default'](userTagTags));
+        return includeSelected ? result : result.filter(function (t) {
           return !___default['default'].some(AudienceTagList, function (at) {
             return at.Id === t.Id;
           });
@@ -8793,9 +8904,7 @@
 
         _this.setState({
           AudienceTagList: AudienceTagList
-        }, function () {
-          return _this.props.updateValidation(_this.validateAudienceSelection());
-        });
+        }, _this.onChangeSelection);
       });
 
       _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onDetachAudienceTag", function (tag) {
@@ -8805,26 +8914,58 @@
 
         _this.setState({
           AudienceTagList: AudienceTagList
-        }, function () {
-          return _this.props.updateValidation(_this.validateAudienceSelection());
-        });
+        }, _this.onChangeSelection);
       });
 
+      _this.state = {
+        categories: [{
+          Title: 'All Primary Users',
+          Key: 'resident',
+          ShortName: 'Primary'
+        }, {
+          Title: 'All Staff Users',
+          Key: 'staff',
+          ShortName: 'Staff'
+        }, {
+          Title: 'All Linked Users',
+          Key: 'family',
+          ShortName: 'Linked'
+        }],
+        types: [],
+        AudienceType: props.audienceType || 'All',
+        showInclude: false,
+        includeList: [],
+        showExclude: false,
+        excludeList: [],
+        Type: '',
+        Category: '',
+        userList: [],
+        tagList: [],
+        AudienceTagList: props.audienceTypeSelection || []
+      };
       return _this;
     }
 
     _createClass__default['default'](AudienceSelector, [{
       key: "componentDidMount",
       value: function componentDidMount() {
-        var _this$props = this.props,
-            disallowUserType = _this$props.disallowUserType,
-            custom = _this$props.custom,
-            disallowSingleUsers = _this$props.disallowSingleUsers,
-            allowTags = _this$props.allowTags;
+        var _this$props2 = this.props,
+            disallowUserType = _this$props2.disallowUserType,
+            custom = _this$props2.custom,
+            disallowSingleUsers = _this$props2.disallowSingleUsers,
+            allowTags = _this$props2.allowTags;
         if (!disallowUserType || custom) this.getUserTypes();
         if (!disallowSingleUsers) this.getUsers();
         if (allowTags || custom) this.getUserTags();
       }
+    }, {
+      key: "componentDidUpdate",
+      value: function componentDidUpdate(prevProps) {
+        var newState = {};
+        if (prevProps.audienceType !== this.props.audienceType) newState.AudienceType = this.props.audienceType;
+        if (!___default['default'].isEqual(prevProps.audienceTypeSelection, this.props.audienceTypeSelection)) newState.AudienceTagList = this.props.audienceTypeSelection;
+        if (!___default['default'].isEmpty(newState)) this.setState(newState);
+      }
     }, {
       key: "onSubmit",
       value: function onSubmit() {
@@ -8848,12 +8989,7 @@
             Category = _this$state2.Category,
             Tag = _this$state2.Tag,
             Type = _this$state2.Type;
-        if (AudienceType === 'Custom') return AudienceTagList.map(function (at) {
-          return {
-            AudienceType: at.AudienceType,
-            AudienceTypeSelection: at.AudienceTypeSelection
-          };
-        });
+        if (AudienceType === 'Custom') return AudienceTagList || [];
         if (AudienceType === 'Category') return Category;
         if (AudienceType === 'UserTags') return Tag;
         return Type;
@@ -8908,29 +9044,26 @@
     }, {
       key: "onChangeOption",
       value: function onChangeOption(type) {
-        var _this4 = this;
-
         this.setState({
           AudienceType: type,
           Type: '',
           Category: '',
           includeList: [],
-          excludeList: []
+          excludeList: [],
+          AudienceTagList: []
         });
-        setTimeout(function () {
-          _this4.props.updateValidation(_this4.validateAudienceSelection());
-        }, 50);
+        setTimeout(this.onChangeSelection, 50);
       }
     }, {
       key: "getOptions",
       value: function getOptions() {
-        var _this5 = this;
+        var _this4 = this;
 
         var options = [{
           Label: 'All users',
           Value: 'All',
           onChange: function onChange() {
-            return _this5.onChangeOption('All');
+            return _this4.onChangeOption('All');
           }
         }];
 
@@ -8939,7 +9072,7 @@
             Label: 'Custom',
             Value: 'Custom',
             onChange: function onChange() {
-              return _this5.onChangeOption('Custom');
+              return _this4.onChangeOption('Custom');
             }
           });
         } else {
@@ -8947,7 +9080,7 @@
             Label: 'By user category',
             Value: 'Category',
             onChange: function onChange() {
-              return _this5.onChangeOption('Category');
+              return _this4.onChangeOption('Category');
             }
           });
         }
@@ -8957,7 +9090,7 @@
             Label: 'By user type',
             Value: 'UserType',
             onChange: function onChange() {
-              return _this5.onChangeOption('UserType');
+              return _this4.onChangeOption('UserType');
             }
           });
         }
@@ -8967,7 +9100,7 @@
             Label: 'By user tag',
             Value: 'UserTags',
             onChange: function onChange() {
-              return _this5.onChangeOption('UserTags');
+              return _this4.onChangeOption('UserTags');
             }
           });
         }
@@ -8977,7 +9110,7 @@
             Label: 'To single users',
             Value: 'User',
             onChange: function onChange() {
-              return _this5.onChangeOption('User');
+              return _this4.onChangeOption('User');
             }
           });
         }
@@ -9000,24 +9133,20 @@
     }, {
       key: "selectType",
       value: function selectType(key) {
-        var _this6 = this;
-
         this.setState({
           Type: key,
           includeList: [],
           excludeList: []
         });
-        setTimeout(function () {
-          _this6.props.updateValidation(_this6.validateAudienceSelection());
-        }, 50);
+        setTimeout(this.onChangeSelection, 50);
       }
     }, {
       key: "getTypeTitle",
       value: function getTypeTitle() {
-        var _this7 = this;
+        var _this5 = this;
 
         var typeObject = ___default['default'].find(this.state.types, function (t) {
-          return t.typeName === _this7.state.Type;
+          return t.typeName === _this5.state.Type;
         });
 
         if (typeObject) {
@@ -9029,10 +9158,10 @@
     }, {
       key: "getTagTitle",
       value: function getTagTitle() {
-        var _this8 = this;
+        var _this6 = this;
 
         var tag = ___default['default'].find(this.state.tagList, function (t) {
-          return t.Id === _this8.state.Tag;
+          return t.Id === _this6.state.Tag;
         });
 
         if (tag) {
@@ -9044,10 +9173,10 @@
     }, {
       key: "getUserTypes",
       value: function getUserTypes() {
-        var _this9 = this;
+        var _this7 = this;
 
         typeActions.getUserTypes(this.props.auth.site).then(function (res) {
-          _this9.props.setAuth({
+          _this7.props.setAuth({
             userTypes: ___default['default'].cloneDeep(res.data)
           });
 
@@ -9056,7 +9185,7 @@
             e.Key = e.typeName;
 
             if (e.category) {
-              var category = ___default['default'].find(_this9.state.categories, function (c) {
+              var category = ___default['default'].find(_this7.state.categories, function (c) {
                 return c.Key === e.category;
               });
 
@@ -9065,7 +9194,7 @@
             }
           });
 
-          _this9.setState({
+          _this7.setState({
             types: res.data
           });
         }).catch(function (error) {});
@@ -9073,12 +9202,12 @@
     }, {
       key: "getUserList",
       value: function getUserList() {
-        var _this10 = this;
+        var _this8 = this;
 
         if (this.state.AudienceType === 'UserType' && !___default['default'].isEmpty(this.state.Type)) {
           var users = [];
           this.state.userList.forEach(function (element) {
-            if (element.type !== _this10.state.Type) users.push(element);
+            if (element.type !== _this8.state.Type) users.push(element);
           });
           return ___default['default'].sortBy(users, 'displayName');
         }
@@ -9087,7 +9216,7 @@
           var _users = [];
 
           var types = ___default['default'].filter(this.state.types, function (type) {
-            return type.category === _this10.state.Category;
+            return type.category === _this8.state.Category;
           }).map(function (type) {
             return type.typeName;
           });
@@ -9105,24 +9234,20 @@
     }, {
       key: "selectCat",
       value: function selectCat(key, e) {
-        var _this11 = this;
-
         this.setState({
           Category: key,
           includeList: [],
           excludeList: []
         });
-        setTimeout(function () {
-          _this11.props.updateValidation(_this11.validateAudienceSelection());
-        }, 50);
+        setTimeout(this.onChangeSelection, 50);
       }
     }, {
       key: "getCatTitle",
       value: function getCatTitle() {
-        var _this12 = this;
+        var _this9 = this;
 
         var typeObject = ___default['default'].find(this.state.categories, function (t) {
-          return t.Key === _this12.state.Category;
+          return t.Key === _this9.state.Category;
         });
 
         if (typeObject) {
@@ -9178,12 +9303,12 @@
     }, {
       key: "getUserExcludeList",
       value: function getUserExcludeList() {
-        var _this13 = this;
+        var _this10 = this;
 
         if (this.state.AudienceType === 'UserType' && !___default['default'].isEmpty(this.state.Type)) {
           var users = [];
           this.state.userList.forEach(function (element) {
-            if (element.type === _this13.state.Type) users.push(element);
+            if (element.type === _this10.state.Type) users.push(element);
           });
           return ___default['default'].sortBy(users, 'displayName');
         }
@@ -9192,7 +9317,7 @@
           var _users2 = [];
 
           var types = ___default['default'].filter(this.state.types, function (type) {
-            return type.category === _this13.state.Category;
+            return type.category === _this10.state.Category;
           }).map(function (type) {
             return type.typeName;
           });
@@ -9210,8 +9335,6 @@
     }, {
       key: "addToInc",
       value: function addToInc(user) {
-        var _this14 = this;
-
         var list = _toConsumableArray__default['default'](this.state.includeList);
 
         list.push({
@@ -9222,23 +9345,17 @@
         this.setState({
           includeList: list
         });
-        setTimeout(function () {
-          _this14.props.updateValidation(_this14.validateAudienceSelection());
-        }, 50);
+        setTimeout(this.onChangeSelection, 50);
       }
     }, {
       key: "removeUserInc",
       value: function removeUserInc(user) {
-        var _this15 = this;
-
         this.setState({
           includeList: ___default['default'].filter(this.state.includeList, function (ev) {
             return ev.Id !== user.Id;
           })
         });
-        setTimeout(function () {
-          _this15.props.updateValidation(_this15.validateAudienceSelection());
-        }, 50);
+        setTimeout(this.onChangeSelection, 50);
       }
     }, {
       key: "addToEx",
@@ -9266,7 +9383,7 @@
     }, {
       key: "renderExcludes",
       value: function renderExcludes() {
-        var _this16 = this;
+        var _this11 = this;
 
         if (!this.showUserPickers(false)) {
           return null;
@@ -9278,8 +9395,8 @@
         }, /*#__PURE__*/React__default['default'].createElement("div", {
           className: "flex flex-between pointer",
           onClick: function onClick() {
-            _this16.setState({
-              showExclude: !_this16.state.showExclude
+            _this11.setState({
+              showExclude: !_this11.state.showExclude
             });
           }
         }, /*#__PURE__*/React__default['default'].createElement("div", {
@@ -9303,7 +9420,7 @@
     }, {
       key: "renderIncludes",
       value: function renderIncludes() {
-        var _this17 = this;
+        var _this12 = this;
 
         if (!this.showUserPickers(true)) {
           return null;
@@ -9315,8 +9432,8 @@
         }, /*#__PURE__*/React__default['default'].createElement("div", {
           className: "flex flex-between pointer",
           onClick: function onClick() {
-            _this17.setState({
-              showInclude: !_this17.state.showInclude
+            _this12.setState({
+              showInclude: !_this12.state.showInclude
             });
           }
         }, /*#__PURE__*/React__default['default'].createElement("div", {
@@ -9340,7 +9457,7 @@
     }, {
       key: "renderAssignedAudiences",
       value: function renderAssignedAudiences() {
-        var _this18 = this;
+        var _this13 = this;
 
         var AudienceTagList = this.state.AudienceTagList;
         var maxWidth = this.props.maxWidth;
@@ -9359,7 +9476,7 @@
             text: t.Title,
             rightIcon: "remove",
             rightClick: function rightClick() {
-              return _this18.onDetachAudienceTag(t);
+              return _this13.onDetachAudienceTag(t);
             }
           });
         }));
@@ -9367,7 +9484,7 @@
     }, {
       key: "renderAvailableAudiences",
       value: function renderAvailableAudiences() {
-        var _this19 = this;
+        var _this14 = this;
 
         var maxWidth = this.props.maxWidth;
         var tags = this.getAvailableAudienceTags();
@@ -9382,7 +9499,7 @@
             className: "marginLeft-16 marginBottom-8",
             text: t.Title,
             onClick: function onClick() {
-              return _this19.onAttachAudienceTag(t);
+              return _this14.onAttachAudienceTag(t);
             }
           });
         }));
@@ -9403,7 +9520,7 @@
     }, {
       key: "render",
       value: function render() {
-        var _this20 = this;
+        var _this15 = this;
 
         return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(Text, {
           type: "formTitleSmall",
@@ -9425,10 +9542,10 @@
           placeholder: "User Category",
           value: this.getCatTitle(),
           isValid: function isValid() {
-            return _this20.validateCategory();
+            return _this15.validateCategory();
           },
           showError: function showError() {
-            return _this20.state.showWarnings && !_this20.validateCategory();
+            return _this15.state.showWarnings && !_this15.validateCategory();
           },
           options: this.state.categories,
           onSelect: this.selectCat.bind(this),
@@ -9445,10 +9562,10 @@
           placeholder: "User Type",
           value: this.getTypeTitle(),
           isValid: function isValid() {
-            return _this20.validateType();
+            return _this15.validateType();
           },
           showError: function showError() {
-            return _this20.state.showWarnings && !_this20.validateType();
+            return _this15.state.showWarnings && !_this15.validateType();
           },
           options: this.state.types,
           onSelect: this.selectType.bind(this),
@@ -9464,10 +9581,10 @@
           placeholder: "User Tag",
           value: this.getTagTitle(),
           isValid: function isValid() {
-            return _this20.validateTag();
+            return _this15.validateTag();
           },
           showError: function showError() {
-            return _this20.state.showWarnings && !_this20.validateTag();
+            return _this15.state.showWarnings && !_this15.validateTag();
           },
           options: this.state.tagList,
           onSelect: this.selectTag,
@@ -10175,6 +10292,8 @@
     Attachment: Attachment,
     Button: Button,
     CheckBox: CheckBox,
+    Comment: Comment,
+    CommentSection: CommentSection,
     DatePicker: DatePicker,
     FileInput: FileInput,
     GenericInput: GenericInput,