@plusscommunities/pluss-core-web 1.2.6 → 1.2.10

package/dist/index.cjs.js

@@ -22,8 +22,8 @@ var FontAwesome = require('react-fontawesome');
 var _extends = require('@babel/runtime/helpers/extends');
 var _assertThisInitialized = require('@babel/runtime/helpers/assertThisInitialized');
 var reactRedux = require('react-redux');
-var Dropzone = require('react-dropzone');
 var Textarea = require('react-textarea-autosize');
+var Dropzone = require('react-dropzone');
 var reactRouter = require('react-router');
 var reactBootstrap = require('react-bootstrap');
 var reactLottie = require('@crello/react-lottie');
@@ -49,8 +49,8 @@ var _getPrototypeOf__default = /*#__PURE__*/_interopDefaultLegacy(_getPrototypeO
 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: {
@@ -691,6 +691,14 @@ var isVideo = function isVideo(url) {
   return ['mov', 'mp4'].includes(extension);
 };
 
+var getFirstName = function getFirstName(string) {
+  if (___default['default'].isEmpty(string)) {
+    return '';
+  }
+
+  return string.split(' ')[0];
+};
+
 var isEmail = function isEmail(email) {
   if (___default['default'].isEmpty(email)) return false;
   var atpos = email.indexOf('@');
@@ -839,12 +847,6 @@ var setLocalStorage = function setLocalStorage(key, value, isJson) {
 //   }
 //   return string.charAt(0).toUpperCase() + string.slice(1);
 // };
-// export const getFirstName = (string) => {
-//   if (_.isEmpty(string)) {
-//     return '';
-//   }
-//   return string.split(' ')[0];
-// };
 // export const get300 = (url) => {
 //   if (!url) {
 //     return url;
@@ -1566,6 +1568,7 @@ var index$3 = /*#__PURE__*/Object.freeze({
   getFileName: getFileName,
   getThumb300: getThumb300,
   isVideo: isVideo,
+  getFirstName: getFirstName,
   isEmail: isEmail,
   isUrl: isUrl,
   randomString: randomString,
@@ -3011,14 +3014,14 @@ var index$1 = /*#__PURE__*/Object.freeze({
   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);
@@ -3995,14 +3998,14 @@ var icons = {
 	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);
@@ -4050,14 +4053,14 @@ var SVGIcon = /*#__PURE__*/function (_Component) {
   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);
@@ -4095,14 +4098,14 @@ function ownKeys$e(object, enumerableOnly) { var keys = Object.keys(object); if
 
 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);
@@ -4202,14 +4205,14 @@ function ownKeys$d(object, enumerableOnly) { var keys = Object.keys(object); if
 
 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;
@@ -4315,14 +4318,303 @@ var styles$8 = {
   }
 };
 
+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", _extends__default['default']({}, this.props, {
+        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: "renderComment",
+    value: function renderComment() {
+      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'))));
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      return /*#__PURE__*/React__default['default'].createElement("div", null, this.renderComment(), this.props.bottomContent);
+    }
+  }]);
+
+  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);
+    })));
+
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "getComments", function () {
+      if (!_this.props.onlyParents) {
+        return _this.props.comments;
+      }
+
+      return ___default['default'].filter(_this.props.comments, function (c) {
+        return !c.ParentId;
+      });
+    });
+
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "renderReplyText", function (c) {
+      if (!_this.props.onOpenThread) {
+        return null;
+      }
+
+      var threadComments = ___default['default'].filter(_this.props.comments, function (innerC) {
+        return innerC.ParentId === c.Id;
+      });
+
+      if (___default['default'].isEmpty(threadComments)) {
+        return /*#__PURE__*/React__default['default'].createElement("div", {
+          className: "comment_reply"
+        }, /*#__PURE__*/React__default['default'].createElement(Text, {
+          className: "comment_reply_button",
+          type: "button",
+          onClick: function onClick() {
+            _this.props.onOpenThread(c);
+          }
+        }, "Reply to ".concat(getFirstName(c.User ? c.User.displayName : 'comment'))));
+      }
+
+      var profilePics = ___default['default'].take(___default['default'].uniqBy(threadComments, function (c) {
+        return c.UserId;
+      }), 3);
+
+      return /*#__PURE__*/React__default['default'].createElement("div", {
+        className: "comment_reply comment_reply-hasReplies"
+      }, profilePics.map(function (c) {
+        return /*#__PURE__*/React__default['default'].createElement(ProfilePic, {
+          className: "comment_reply_profilePic",
+          size: 20,
+          image: c.User.profilePic
+        });
+      }), /*#__PURE__*/React__default['default'].createElement(Text, {
+        className: "comment_reply_button",
+        type: "button",
+        onClick: function onClick() {
+          _this.props.onOpenThread(c);
+        }
+      }, "".concat(threadComments.length, " repl").concat(getPluralOptions(threadComments.length, 'y', 'ies'))));
+    });
+
+    _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.getComments().map(function (c) {
+        return /*#__PURE__*/React__default['default'].createElement(Comment, {
+          key: c.Id,
+          comment: c,
+          bottomContent: _this2.renderReplyText(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;
@@ -4378,14 +4670,14 @@ var P60Icon = /*#__PURE__*/function (_Component) {
   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;
@@ -4698,13 +4990,13 @@ var DatePicker = /*#__PURE__*/function (_Component) {
   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: ''
@@ -4713,7 +5005,7 @@ var DEFAULT_INPUT$1 = {
 var FileInputComponent = /*#__PURE__*/function (_Component) {
   _inherits__default['default'](FileInputComponent, _Component);
 
-  var _super = _createSuper$r(FileInputComponent);
+  var _super = _createSuper$p(FileInputComponent);
 
   function FileInputComponent() {
     var _this;
@@ -4768,7 +5060,7 @@ var FileInputComponent = /*#__PURE__*/function (_Component) {
               _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);
 
@@ -4991,7 +5283,7 @@ var FileInputComponent = /*#__PURE__*/function (_Component) {
             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", {
@@ -5017,7 +5309,7 @@ var FileInputComponent = /*#__PURE__*/function (_Component) {
 
         return /*#__PURE__*/React__default['default'].createElement("div", {
           className: "imageInput_image",
-          style: _objectSpread$c({}, _this3.props.style)
+          style: _objectSpread$b({}, _this3.props.style)
         });
       };
 
@@ -5048,12 +5340,12 @@ var FileInputComponent = /*#__PURE__*/function (_Component) {
       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;
@@ -5072,7 +5364,7 @@ var FileInputComponent = /*#__PURE__*/function (_Component) {
         }, _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"
@@ -5085,7 +5377,7 @@ var FileInputComponent = /*#__PURE__*/function (_Component) {
 
       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);
       }));
@@ -5107,26 +5399,26 @@ var FileInputComponent = /*#__PURE__*/function (_Component) {
   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);
@@ -5231,7 +5523,7 @@ var GenericInput = /*#__PURE__*/function (_Component) {
 
       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", {
@@ -5242,7 +5534,7 @@ var GenericInput = /*#__PURE__*/function (_Component) {
       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", {
@@ -5256,7 +5548,7 @@ var GenericInput = /*#__PURE__*/function (_Component) {
           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(),
@@ -5268,7 +5560,7 @@ var GenericInput = /*#__PURE__*/function (_Component) {
 
 
       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", {
@@ -5284,7 +5576,7 @@ var GenericInput = /*#__PURE__*/function (_Component) {
         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(),
@@ -5299,9 +5591,9 @@ var GenericInput = /*#__PURE__*/function (_Component) {
     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'
         })
@@ -5324,14 +5616,14 @@ var styles$7 = {
   }
 };
 
-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;
@@ -5438,29 +5730,29 @@ var Header = /*#__PURE__*/function (_Component) {
   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);
@@ -5518,7 +5810,7 @@ var Popup = /*#__PURE__*/function (_Component) {
           return /*#__PURE__*/React__default['default'].createElement(Button, {
             key: index,
             buttonType: b.type,
-            style: _objectSpread$a({
+            style: _objectSpread$9({
               marginLeft: 8,
               marginRight: 8
             }, b.style),
@@ -5537,7 +5829,7 @@ var Popup = /*#__PURE__*/function (_Component) {
         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,
@@ -5570,13 +5862,13 @@ var Popup = /*#__PURE__*/function (_Component) {
   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: '',
@@ -5586,7 +5878,7 @@ var DEFAULT_INPUT = {
 var ImageInputComponent = /*#__PURE__*/function (_Component) {
   _inherits__default['default'](ImageInputComponent, _Component);
 
-  var _super = _createSuper$n(ImageInputComponent);
+  var _super = _createSuper$l(ImageInputComponent);
 
   function ImageInputComponent() {
     var _this;
@@ -5717,7 +6009,7 @@ var ImageInputComponent = /*#__PURE__*/function (_Component) {
               case 5:
                 folders = _context2.sent;
 
-                _this.setState(_objectSpread$9({
+                _this.setState(_objectSpread$8({
                   addingFolder: false,
                   folders: folders
                 }, _this.cancelAddStates));
@@ -5782,7 +6074,7 @@ var ImageInputComponent = /*#__PURE__*/function (_Component) {
               _this.handleFile(newInput, file);
             }
           } else {
-            var _newInput = _objectSpread$9(_objectSpread$9({}, DEFAULT_INPUT), {}, {
+            var _newInput = _objectSpread$8(_objectSpread$8({}, DEFAULT_INPUT), {}, {
               fromLibrary: fromLibrary
             });
 
@@ -5885,11 +6177,11 @@ var ImageInputComponent = /*#__PURE__*/function (_Component) {
       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;
@@ -5942,7 +6234,7 @@ var ImageInputComponent = /*#__PURE__*/function (_Component) {
         // 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;
 
@@ -6403,7 +6695,7 @@ var ImageInputComponent = /*#__PURE__*/function (_Component) {
             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) {
@@ -6419,7 +6711,7 @@ var ImageInputComponent = /*#__PURE__*/function (_Component) {
 
         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)
         });
       };
 
@@ -6452,12 +6744,12 @@ var ImageInputComponent = /*#__PURE__*/function (_Component) {
       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;
@@ -6476,7 +6768,7 @@ var ImageInputComponent = /*#__PURE__*/function (_Component) {
         }, _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"
@@ -6502,7 +6794,7 @@ var ImageInputComponent = /*#__PURE__*/function (_Component) {
         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"
@@ -6695,7 +6987,7 @@ var ImageInputComponent = /*#__PURE__*/function (_Component) {
       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'], {
@@ -6744,7 +7036,7 @@ var ImageInputComponent = /*#__PURE__*/function (_Component) {
 
       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);
       }));
@@ -6869,24 +7161,24 @@ var styles$6 = {
   }
 };
 
-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);
@@ -6916,18 +7208,18 @@ var MoreMenu = /*#__PURE__*/function (_Component) {
   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;
@@ -6980,9 +7272,9 @@ var OverlayPage = /*#__PURE__*/function (_Component) {
     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());
     }
   }]);
@@ -7009,18 +7301,18 @@ var styles$5 = {
   }
 };
 
-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;
@@ -7051,7 +7343,7 @@ var OverlayPageContents = /*#__PURE__*/function (_Component) {
       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)
@@ -7075,18 +7367,18 @@ var styles$4 = {
   }
 };
 
-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);
@@ -7108,7 +7400,7 @@ var OverlayPageSection = /*#__PURE__*/function (_Component) {
     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);
     }
   }]);
@@ -7127,18 +7419,18 @@ var styles$3 = {
   }
 };
 
-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;
@@ -7168,7 +7460,7 @@ var OverlayPageBottomButtons = /*#__PURE__*/function (_Component) {
     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);
@@ -7192,14 +7484,14 @@ var styles$2 = {
   }
 };
 
-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);
@@ -7219,106 +7511,6 @@ var PageTitle = /*#__PURE__*/function (_Component) {
   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; }
@@ -8883,7 +9075,7 @@ var AudienceSelector = /*#__PURE__*/function (_Component) {
           Category = _this$state2.Category,
           Tag = _this$state2.Tag,
           Type = _this$state2.Type;
-      if (AudienceType === 'Custom') return AudienceTagList;
+      if (AudienceType === 'Custom') return AudienceTagList || [];
       if (AudienceType === 'Category') return Category;
       if (AudienceType === 'UserTags') return Tag;
       return Type;
@@ -8943,7 +9135,8 @@ var AudienceSelector = /*#__PURE__*/function (_Component) {
         Type: '',
         Category: '',
         includeList: [],
-        excludeList: []
+        excludeList: [],
+        AudienceTagList: []
       });
       setTimeout(this.onChangeSelection, 50);
     }
@@ -10056,8 +10249,6 @@ var ExportCsvPopup = /*#__PURE__*/function (_Component) {
     });
 
     _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onToggleColumn", function (key) {
-      var source = _this.props.source;
-
       var columns = ___default['default'].cloneDeep(_this.state.columns);
 
       var column = columns.find(function (c) {
@@ -10073,25 +10264,132 @@ var ExportCsvPopup = /*#__PURE__*/function (_Component) {
         var selectedHeaders = columns.filter(function (c) {
           return c.key && c.selected;
         });
-        var selectedheaderKeys = selectedHeaders.map(function (h) {
-          return h.key;
+
+        _this.setState({
+          columns: columns,
+          selectedHeaders: selectedHeaders
         });
-        var selectedSource = source.map(function (i) {
-          return ___default['default'].pick(i, selectedheaderKeys);
+      }
+    });
+
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onToggleStartDateFilter", function () {
+      var filterDateStartVisible = _this.state.filterDateStartVisible;
+
+      if (filterDateStartVisible) {
+        setTimeout(function () {
+          return _this.setState({
+            filterDateStartVisible: false
+          });
+        }, 200);
+      } else {
+        _this.setState({
+          filterDateStartVisible: true
         });
+      }
+    });
+
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onToggleEndDateFilter", function () {
+      var filterDateEndVisible = _this.state.filterDateEndVisible;
 
+      if (filterDateEndVisible) {
+        setTimeout(function () {
+          return _this.setState({
+            filterDateEndVisible: false
+          });
+        }, 200);
+      } else {
         _this.setState({
-          columns: columns,
-          selectedHeaders: selectedHeaders,
-          selectedSource: selectedSource
+          filterDateEndVisible: true
+        });
+      }
+    });
+
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onDateFilterStartChanged", function (date) {
+      var filterDateEnd = _this.state.filterDateEnd;
+      var start = moment__default['default'](date);
+
+      if (start.isSameOrBefore(filterDateEnd)) {
+        _this.setState({
+          filterDateStart: start.startOf('day'),
+          filterDateStartVisible: false
+        });
+      }
+    });
+
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onDateFilterEndChanged", function (date) {
+      var filterDateStart = _this.state.filterDateStart;
+      var end = moment__default['default'](date);
+
+      if (end.isSameOrAfter(filterDateStart)) {
+        _this.setState({
+          filterDateEnd: end.endOf('day'),
+          filterDateEndVisible: false
         });
       }
     });
 
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "getSelectedSource", function () {
+      var source = _this.props.source;
+      var selectedHeaders = _this.state.selectedHeaders;
+      var result = source; // apply timestamp filter
+
+      if (_this.props.timestampFilter) {
+        var _this$state = _this.state,
+            filterDateStart = _this$state.filterDateStart,
+            filterDateEnd = _this$state.filterDateEnd;
+        var filterKey = _this.props.timestampFilter.filterKey;
+        var minDate = filterDateStart.valueOf();
+        var maxDate = filterDateEnd.valueOf();
+        result = ___default['default'].filter(source, function (item) {
+          return item[filterKey] >= minDate && item[filterKey] <= maxDate;
+        });
+      } // map result to columns
+
+
+      var selectedheaderKeys = selectedHeaders.map(function (h) {
+        return h.key;
+      });
+      return result.map(function (i) {
+        return ___default['default'].pick(i, selectedheaderKeys);
+      });
+    });
+
+    _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "renderTimestampFilter", function () {
+      if (!_this.props.timestampFilter) {
+        return null;
+      }
+
+      return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(GenericInput, {
+        id: "dateStart",
+        label: "Start Date",
+        alwaysShowLabel: true,
+        placeholder: 'Select start date',
+        value: _this.state.filterDateStart.format('DD/MM/YYYY'),
+        onClick: _this.onToggleStartDateFilter,
+        readOnly: true
+      }), _this.state.filterDateStartVisible ? /*#__PURE__*/React__default['default'].createElement(DatePicker, {
+        hideTop: true,
+        selectedDate: _this.state.filterDateStart,
+        selectDate: _this.onDateFilterStartChanged
+      }) : null, /*#__PURE__*/React__default['default'].createElement(GenericInput, {
+        id: "dateEnd",
+        label: "End Date",
+        alwaysShowLabel: true,
+        placeholder: 'Select end date',
+        value: _this.state.filterDateEnd.format('DD/MM/YYYY'),
+        onClick: _this.onToggleEndDateFilter,
+        readOnly: true
+      }), _this.state.filterDateEndVisible ? /*#__PURE__*/React__default['default'].createElement(DatePicker, {
+        hideTop: true,
+        selectedDate: _this.state.filterDateEnd,
+        selectDate: _this.onDateFilterEndChanged
+      }) : null);
+    });
+
     _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "renderContent", function () {
-      var _this$state = _this.state,
-          saving = _this$state.saving,
-          columns = _this$state.columns;
+      var _this$state2 = _this.state,
+          saving = _this$state2.saving,
+          columns = _this$state2.columns;
 
       if (saving) {
         return /*#__PURE__*/React__default['default'].createElement("div", {
@@ -10126,27 +10424,35 @@ var ExportCsvPopup = /*#__PURE__*/function (_Component) {
       }));
     });
 
-    _this.state = {
+    var state = {
       columns: props.columns,
+      selectedHeaders: props.columns.filter(function (c) {
+        return c.key && c.selected;
+      }),
       selectedSource: [],
       saving: false
     };
+
+    if (props.timestampFilter) {
+      state.filterDateStart = props.timestampFilter.startDate;
+      state.filterDateEnd = props.timestampFilter.endDate;
+    }
+
+    _this.state = state;
     return _this;
   }
 
   _createClass__default['default'](ExportCsvPopup, [{
     key: "render",
     value: function render() {
-      var _this$state2 = this.state,
-          selectedHeaders = _this$state2.selectedHeaders,
-          selectedSource = _this$state2.selectedSource;
+      var selectedHeaders = this.state.selectedHeaders;
       var filename = this.props.filename;
       var buttons = [{
         type: 'primary',
         isActive: this.canSave(),
         text: /*#__PURE__*/React__default['default'].createElement(reactCsv.CSVLink, {
           headers: selectedHeaders,
-          data: selectedSource,
+          data: this.getSelectedSource(),
           style: {
             textDecoration: 'none',
             color: '#fff'
@@ -10162,7 +10468,6 @@ var ExportCsvPopup = /*#__PURE__*/function (_Component) {
       }];
       return /*#__PURE__*/React__default['default'].createElement(Popup, {
         title: "Confirm Export",
-        subtitle: "Select which columns to include in the export",
         boxClasses: "flex flex-column",
         innerClasses: "flex flex-column fillSpace flex-1",
         minWidth: 500,
@@ -10172,7 +10477,9 @@ var ExportCsvPopup = /*#__PURE__*/function (_Component) {
         hasPadding: true,
         onClose: this.onClose,
         buttons: buttons
-      }, this.renderContent());
+      }, this.renderTimestampFilter(), /*#__PURE__*/React__default['default'].createElement(Text, {
+        type: "bodyLarge"
+      }, "Select which columns to include in the export"), this.renderContent());
     }
   }]);
 
@@ -10185,6 +10492,8 @@ var index = /*#__PURE__*/Object.freeze({
   Attachment: Attachment,
   Button: Button,
   CheckBox: CheckBox,
+  Comment: Comment,
+  CommentSection: CommentSection,
   DatePicker: DatePicker,
   FileInput: FileInput,
   GenericInput: GenericInput,