@plusscommunities/pluss-maintenance-app 6.0.6-auth.0 → 6.0.6-beta.0

package/dist/module/screens/MaintenancePage.js

@@ -1,5 +1,5 @@
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import React, { Component } from 'react';
 import { View, StyleSheet } from 'react-native';
@@ -8,6 +8,7 @@ import _ from 'lodash';
 import MaintenanceList from '../components/MaintenanceList';
 import { Services, BaseComponents } from '../feature.config';
 import { Components, Helper, Styles, Config } from '../core.config';
+import { values } from '../values.config';
 class MaintenancePage extends Component {
   constructor(props) {
     super(props);
@@ -31,9 +32,10 @@ class MaintenancePage extends Component {
     });
   }
   renderHeader() {
+    const title = this.props.title || this.props.strings[`${values.featureKey}_textFeatureTitle`] || values.textFeatureTitle;
     if (this.state.isHomeTab) {
       return /*#__PURE__*/React.createElement(Components.Header, {
-        text: this.props.title || Config.env.strings.MAINTENANCE,
+        text: title,
         rightContent: _.includes(this.props.user.hidden, 'notifications') ? null : /*#__PURE__*/React.createElement(View, {
           style: styles.notificationContainer
         }, /*#__PURE__*/React.createElement(BaseComponents.NotificationBell, {
@@ -45,7 +47,7 @@ class MaintenancePage extends Component {
     return /*#__PURE__*/React.createElement(Components.Header, {
       leftIcon: "angle-left",
       onPressLeft: this.onPressBack,
-      text: this.props.title || Config.env.strings.MAINTENANCE
+      text: values.textFeatureTitle
     });
   }
   render() {
@@ -80,8 +82,10 @@ const styles = StyleSheet.create({
   }
 });
 const mapStateToProps = state => {
+  var _state$strings;
   return {
-    user: state.user
+    user: state.user,
+    strings: ((_state$strings = state.strings) === null || _state$strings === void 0 ? void 0 : _state$strings.config) || {}
   };
 };
 export default connect(mapStateToProps, {})(MaintenancePage);

package/dist/module/screens/MaintenancePage.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","Component","View","StyleSheet","connect","_","MaintenanceList","Services","BaseComponents","Components","Helper","Styles","Config","MaintenancePage","constructor","props","_defineProperty","navigation","goBack","loading","setState","state","isHomeTab","componentDidMount","getParentRoute","renderHeader","createElement","Header","text","title","env","strings","MAINTENANCE","rightContent","includes","user","hidden","style","styles","notificationContainer","NotificationBell","colourBrandingHeader","containerStyle","notificationBell","leftIcon","onPressLeft","onPressBack","render","container","LoadingIndicator","visible","maintenanceList","onLoadingChanged","enableAdd","options","create","flex","position","top","bottom","right","paddingTop","StatusBarHeight","marginTop","mapStateToProps"],"sources":["MaintenancePage.js"],"sourcesContent":["import React, { Component } from 'react';\nimport { View, StyleSheet } from 'react-native';\nimport { connect } from 'react-redux';\nimport _ from 'lodash';\nimport MaintenanceList from '../components/MaintenanceList';\nimport { Services, BaseComponents } from '../feature.config';\nimport { Components, Helper, Styles, Config } from '../core.config';\n\nclass MaintenancePage extends Component {\n  constructor(props) {\n    super(props);\n    this.state = {\n      isHomeTab: false,\n      loading: false,\n    };\n  }\n\n  componentDidMount() {\n    // console.log('!Services.navigation.getParentRoute()', !Services.navigation.getParentRoute());\n    this.setState({ isHomeTab: !Services.navigation.getParentRoute() });\n  }\n\n  onPressBack = () => {\n    Services.navigation.goBack();\n  };\n\n  onLoadingChanged = loading => {\n    this.setState({ loading });\n  };\n\n  renderHeader() {\n    if (this.state.isHomeTab) {\n      return (\n        <Components.Header\n          text={this.props.title || Config.env.strings.MAINTENANCE}\n          rightContent={\n            _.includes(this.props.user.hidden, 'notifications') ? null : (\n              <View style={styles.notificationContainer}>\n                <BaseComponents.NotificationBell\n                  colourBrandingHeader={this.props.colourBrandingHeader}\n                  containerStyle={Styles.notificationBell}\n                />\n              </View>\n            )\n          }\n        />\n      );\n    }\n    return (\n      <Components.Header leftIcon=\"angle-left\" onPressLeft={this.onPressBack} text={this.props.title || Config.env.strings.MAINTENANCE} />\n    );\n  }\n\n  render() {\n    const { isHomeTab } = this.state;\n\n    return (\n      <View style={styles.container}>\n        {this.renderHeader()}\n        <Components.LoadingIndicator visible={this.state.loading} />\n        <MaintenanceList\n          style={styles.maintenanceList}\n          onLoadingChanged={this.onLoadingChanged}\n          enableAdd={!isHomeTab}\n          options={this.props.options}\n        />\n        {/* {isHomeTab && <Components.AddContentButton />} */}\n      </View>\n    );\n  }\n}\n\nconst styles = StyleSheet.create({\n  container: {\n    flex: 1,\n  },\n  notificationContainer: {\n    position: 'absolute',\n    top: 0,\n    bottom: 0,\n    right: 0,\n    paddingTop: Helper.StatusBarHeight(0),\n  },\n  maintenanceList: {\n    marginTop: 12,\n  },\n});\n\nconst mapStateToProps = state => {\n  return {\n    user: state.user,\n  };\n};\n\nexport default connect(mapStateToProps, {})(MaintenancePage);\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","Component","View","StyleSheet","connect","_","MaintenanceList","Services","BaseComponents","Components","Helper","Styles","Config","values","MaintenancePage","constructor","props","_defineProperty","navigation","goBack","loading","setState","state","isHomeTab","componentDidMount","getParentRoute","renderHeader","title","strings","featureKey","textFeatureTitle","createElement","Header","text","rightContent","includes","user","hidden","style","styles","notificationContainer","NotificationBell","colourBrandingHeader","containerStyle","notificationBell","leftIcon","onPressLeft","onPressBack","render","container","LoadingIndicator","visible","maintenanceList","onLoadingChanged","enableAdd","options","create","flex","position","top","bottom","right","paddingTop","StatusBarHeight","marginTop","mapStateToProps","_state$strings","config"],"sources":["MaintenancePage.js"],"sourcesContent":["import React, { Component } from 'react';\nimport { View, StyleSheet } from 'react-native';\nimport { connect } from 'react-redux';\nimport _ from 'lodash';\nimport MaintenanceList from '../components/MaintenanceList';\nimport { Services, BaseComponents } from '../feature.config';\nimport { Components, Helper, Styles, Config } from '../core.config';\nimport { values } from '../values.config';\n\nclass MaintenancePage extends Component {\n  constructor(props) {\n    super(props);\n    this.state = {\n      isHomeTab: false,\n      loading: false,\n    };\n  }\n\n  componentDidMount() {\n    // console.log('!Services.navigation.getParentRoute()', !Services.navigation.getParentRoute());\n    this.setState({ isHomeTab: !Services.navigation.getParentRoute() });\n  }\n\n  onPressBack = () => {\n    Services.navigation.goBack();\n  };\n\n  onLoadingChanged = loading => {\n    this.setState({ loading });\n  };\n\n  renderHeader() {\n    const title = this.props.title || this.props.strings[`${values.featureKey}_textFeatureTitle`] || values.textFeatureTitle;\n    if (this.state.isHomeTab) {\n      return (\n        <Components.Header\n          text={title}\n          rightContent={\n            _.includes(this.props.user.hidden, 'notifications') ? null : (\n              <View style={styles.notificationContainer}>\n                <BaseComponents.NotificationBell\n                  colourBrandingHeader={this.props.colourBrandingHeader}\n                  containerStyle={Styles.notificationBell}\n                />\n              </View>\n            )\n          }\n        />\n      );\n    }\n    return <Components.Header leftIcon=\"angle-left\" onPressLeft={this.onPressBack} text={values.textFeatureTitle} />;\n  }\n\n  render() {\n    const { isHomeTab } = this.state;\n\n    return (\n      <View style={styles.container}>\n        {this.renderHeader()}\n        <Components.LoadingIndicator visible={this.state.loading} />\n        <MaintenanceList\n          style={styles.maintenanceList}\n          onLoadingChanged={this.onLoadingChanged}\n          enableAdd={!isHomeTab}\n          options={this.props.options}\n        />\n        {/* {isHomeTab && <Components.AddContentButton />} */}\n      </View>\n    );\n  }\n}\n\nconst styles = StyleSheet.create({\n  container: {\n    flex: 1,\n  },\n  notificationContainer: {\n    position: 'absolute',\n    top: 0,\n    bottom: 0,\n    right: 0,\n    paddingTop: Helper.StatusBarHeight(0),\n  },\n  maintenanceList: {\n    marginTop: 12,\n  },\n});\n\nconst mapStateToProps = state => {\n  return {\n    user: state.user,\n    strings: state.strings?.config || {},\n  };\n};\n\nexport default connect(mapStateToProps, {})(MaintenancePage);\n"],"mappings":"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"}

package/dist/module/screens/RequestDetail.js

@@ -1,5 +1,5 @@
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import React, { Component } from 'react';
 import { ScrollView, View, StyleSheet, Text, KeyboardAvoidingView, TouchableOpacity, ImageBackground, Platform } from 'react-native';
@@ -14,6 +14,7 @@ import StatusSelectorPopup from '../components/StatusSelectorPopup';
 import { jobStatusOptions, getJobStatusProps } from '../helper';
 import { Services } from '../feature.config';
 import { Colours, Helper, Components, Config } from '../core.config';
+import { values } from '../values.config';
 class RequestDetail extends Component {
   constructor(props) {
     super(props);
@@ -25,7 +26,7 @@ class RequestDetail extends Component {
         try {
           const res = await maintenanceActions.getJob(this.props.job.site, this.props.job.id);
           this.props.jobAdded(res.data);
-          console.log('got the job');
+          this.updateJobState(res.data);
         } catch (error) {
           console.log('getJob error', error.toString());
           // check for 403 or 404 error
@@ -77,6 +78,7 @@ class RequestDetail extends Component {
           const res = await maintenanceActions.editJob(updated, user.site);
           // console.log('markSeen updated');
           this.props.jobAdded(res.data.job);
+          this.getJob();
           this.setState({
             loading: false,
             seen: true
@@ -108,6 +110,7 @@ class RequestDetail extends Component {
           }
           const res = await maintenanceActions.editJob(updated, user.site);
           this.props.jobAdded(res.data.job);
+          this.getJob();
         } catch (error) {
           console.log('updateJob error', error);
         } finally {
@@ -124,6 +127,7 @@ class RequestDetail extends Component {
         try {
           const res = await maintenanceActions.editJobStatus(this.props.job.id, this.state.status);
           this.props.jobAdded(res.data.job);
+          this.getJob();
         } catch (error) {
           console.log('updateJobStatus error', error);
         } finally {
@@ -155,8 +159,9 @@ class RequestDetail extends Component {
       });
     });
     _defineProperty(this, "openStaffNotes", () => {
-      Services.navigation.navigate('requestNotes', {
-        job: this.state.job
+      Services.navigation.navigate(values.screenRequestNotes, {
+        job: this.state.job,
+        onChange: this.getJob
       });
     });
     _defineProperty(this, "onOpenDatePicker", () => {
@@ -207,6 +212,7 @@ class RequestDetail extends Component {
           const job = await maintenanceActions.getJob(this.props.user.site, this.props.job.id);
           // console.log('onCommentAdded', job?.data);
           this.props.jobAdded(job.data);
+          this.getJob();
         } catch (error) {
           console.log('onCommentAdded error', error);
         } finally {
@@ -223,10 +229,10 @@ class RequestDetail extends Component {
       const {
         permissions
       } = this.props.user;
-      if (_.includes(permissions, 'maintenanceTracking')) {
+      if (_.includes(permissions, values.permissionMaintenanceTracking)) {
         return true;
       }
-      if (_.includes(permissions, 'maintenanceAssignment')) {
+      if (_.includes(permissions, values.permissionMaintenanceAssign)) {
         return job.AssigneeId === this.props.user.Id;
       }
       return false;
@@ -260,6 +266,7 @@ class RequestDetail extends Component {
           console.log('onSelectAssignee', this.props.job.id, assignee.key);
           const res = await maintenanceActions.assignJob(this.props.job.id, assignee.key);
           this.props.jobAdded(res.data.job);
+          this.getJob();
         } catch (error) {
           console.log('onSelectAssignee error', error);
         } finally {
@@ -283,6 +290,7 @@ class RequestDetail extends Component {
       showFullscreenVideo: false,
       currentVideoUrl: '',
       galleryOpen: false,
+      galleryImages: [],
       showMessages: false,
       assignees: []
     };
@@ -292,16 +300,15 @@ class RequestDetail extends Component {
   }
   componentDidMount() {
     this.getJob();
-    this.updateJobState();
+    this.updateJobState(this.props.job);
     this.getAssignees();
   }
-  componentDidUpdate(prevProps) {
-    if (prevProps.jobs !== this.props.jobs) {
-      this.updateJobState();
+  updateJobState(defaultJob) {
+    const job = _.find(this.props.jobs, j => j.id === this.props.job.id) || defaultJob;
+    if (!job) {
+      this.getJob();
+      return;
     }
-  }
-  updateJobState() {
-    const job = _.find(this.props.jobs, j => j.id === this.props.job.id) || this.props.job;
     const newState = {
       job,
       status: job.status
@@ -315,9 +322,10 @@ class RequestDetail extends Component {
       this.markSeen();
     });
   }
-  openGallery(index) {
+  openGallery(galleryImages, index) {
     this.setState({
-      galleryOpen: true
+      galleryOpen: true,
+      galleryImages
     });
     this.refs.imagePopup.scrollTo(index);
   }
@@ -352,7 +360,7 @@ class RequestDetail extends Component {
       style: [styles.jobIdText, {
         color: this.props.colourBrandingMain
       }]
-    }, `Job #${job.jobId}`) : null, /*#__PURE__*/React.createElement(Text, {
+    }, `${values.textEntityName} #${job.jobId}`) : null, /*#__PURE__*/React.createElement(Text, {
       style: styles.jobTitleText
     }, job.title), /*#__PURE__*/React.createElement(View, {
       style: styles.jobTypeSeenContainer
@@ -417,7 +425,8 @@ class RequestDetail extends Component {
       style: styles.jobStatusText
     }, "Notes (", (job.Notes || []).length, ")"))))));
   }
-  renderPlayableImageUrl(url, index, containerStyle, showMore) {
+  renderPlayableImageUrl(images, index, containerStyle, showMore) {
+    const url = images[index || 0];
     const thumbUrl = Helper.getThumb300(url);
     if (Helper.isVideo(url)) {
       return /*#__PURE__*/React.createElement(ImageBackground, {
@@ -440,7 +449,7 @@ class RequestDetail extends Component {
     const imageUrl = Helper.get1400(url);
     return /*#__PURE__*/React.createElement(TouchableOpacity, {
       style: containerStyle,
-      onPress: this.openGallery.bind(this, index || 0)
+      onPress: this.openGallery.bind(this, images, index || 0)
     }, /*#__PURE__*/React.createElement(ImageBackground, {
       style: styles.imageContainer,
       source: {
@@ -450,35 +459,31 @@ class RequestDetail extends Component {
       style: styles.plusImages
     }, "+", this.state.job.images.length - 2)));
   }
-  renderPlayableImage(index, containerStyle, showMore) {
-    const url = this.state.job.images[index];
-    return this.renderPlayableImageUrl(url, index, containerStyle, showMore);
+  renderPlayableImage(images, index, containerStyle, showMore) {
+    return this.renderPlayableImageUrl(images, index, containerStyle, showMore);
   }
-  renderImage() {
-    const {
-      job
-    } = this.state;
-    if (!_.isNil(job.images) && !_.isEmpty(job.images)) {
-      if (job.images.length >= 2) {
+  renderImage(images, image = null) {
+    if (!_.isNil(images) && !_.isEmpty(images)) {
+      if (images.length >= 2) {
         return /*#__PURE__*/React.createElement(View, {
           style: styles.sideBySideImages
-        }, this.renderPlayableImage(0, styles.sideBySideImageContainer), this.renderPlayableImage(1, styles.sideBySideImageContainer, job.images.length > 2));
+        }, this.renderPlayableImage(images, 0, styles.sideBySideImageContainer), this.renderPlayableImage(images, 1, styles.sideBySideImageContainer, images.length > 2));
       } else {
         return /*#__PURE__*/React.createElement(View, {
           style: styles.singleImageContainer
-        }, this.renderPlayableImage(0));
+        }, this.renderPlayableImage(images, 0));
       }
-    } else if (!_.isNil(job.image)) {
+    } else if (!_.isNil(image)) {
       return /*#__PURE__*/React.createElement(View, {
         style: styles.singleImageContainer
-      }, this.renderPlayableImageUrl(job.image));
+      }, this.renderPlayableImageUrl([image], 0));
     }
     return null;
   }
   renderImagePopup() {
     return /*#__PURE__*/React.createElement(Components.ImagePopup, {
       visible: this.state.galleryOpen,
-      images: this.state.job.images || [this.state.job.image],
+      images: this.state.galleryImages,
       onClose: this.closeGallery.bind(this),
       ref: "imagePopup"
     });
@@ -511,24 +516,75 @@ class RequestDetail extends Component {
     }
     return content;
   }
+  renderCustomFields() {
+    const {
+      job
+    } = this.state;
+    const {
+      customFields
+    } = job;
+    const renderAnswer = field => {
+      switch (field.type) {
+        case 'date':
+          return /*#__PURE__*/React.createElement(Text, {
+            style: styles.customText
+          }, field.answer ? moment(field.answer, 'YYYY-MM-DD').format('DD MMM YYYY') : '');
+        case 'time':
+          return /*#__PURE__*/React.createElement(Text, {
+            style: styles.customText
+          }, field.answer ? moment(field.answer, 'HH:mm').format('h:mm a') : '');
+        case 'yn':
+          return /*#__PURE__*/React.createElement(Text, {
+            style: styles.customText
+          }, field.answer ? 'Yes' : 'No');
+        case 'checkbox':
+          return /*#__PURE__*/React.createElement(Text, {
+            style: styles.customText
+          }, field.answer && Array.isArray(field.answer) ? field.answer.join(', ') : '');
+        case 'image':
+          return /*#__PURE__*/React.createElement(View, {
+            style: {
+              marginTop: 8
+            }
+          }, this.renderImage(field.answer));
+        default:
+          return /*#__PURE__*/React.createElement(Text, {
+            style: styles.customText
+          }, field.answer);
+      }
+    };
+    return customFields.map((field, index) => {
+      if (['staticTitle', 'staticText'].includes(field.type)) return null;
+      if (_.isNil(field.answer) || field.answer === '' || Array.isArray(field.answer) && field.answer.length === 0) return null;
+      return /*#__PURE__*/React.createElement(View, {
+        key: index
+      }, /*#__PURE__*/React.createElement(Text, {
+        style: styles.customLabel
+      }, field.label), renderAnswer(field));
+    });
+  }
   rendeDetails() {
     const {
       job
     } = this.state;
+    const {
+      customFields
+    } = job;
+    const hasCustomFields = customFields && customFields.length > 0;
     return /*#__PURE__*/React.createElement(View, null, /*#__PURE__*/React.createElement(Components.FormCardSectionOptionLauncher, {
       onPress: this.onToggleDetails,
       title: "Details",
       icon: this.state.showMore ? 'angle-up' : 'angle-down',
       textStyle: styles.detailsText,
       sectionStyle: styles.detailsSection
-    }), this.state.showMore && /*#__PURE__*/React.createElement(View, null, this.renderImage(), !_.isEmpty(job.description) && /*#__PURE__*/React.createElement(Text, {
+    }), this.state.showMore && /*#__PURE__*/React.createElement(View, null, hasCustomFields ? this.renderCustomFields() : null, !hasCustomFields ? /*#__PURE__*/React.createElement(React.Fragment, null, this.renderImage(job.images, job.image), !_.isEmpty(job.description) && /*#__PURE__*/React.createElement(Text, {
       numberOfLines: 10,
       style: styles.jobDescriptionText
-    }, job.description), /*#__PURE__*/React.createElement(Text, {
+    }, job.description)) : null, /*#__PURE__*/React.createElement(Text, {
       style: styles.locationLabel
-    }, "Location"), /*#__PURE__*/React.createElement(Text, {
+    }, "Address"), /*#__PURE__*/React.createElement(Text, {
       style: styles.locationText
-    }, job.room), job.isHome ? /*#__PURE__*/React.createElement(View, {
+    }, job.room), !hasCustomFields && job.isHome ? /*#__PURE__*/React.createElement(View, {
       style: styles.detailsSection
     }, /*#__PURE__*/React.createElement(Text, {
       style: styles.locationLabel
@@ -554,8 +610,8 @@ class RequestDetail extends Component {
       ref: this.commentSection,
       commentReply: this.commentReply,
       scrollView: this.scrollView,
-      adminPermission: "maintenanceTracking",
-      entityType: "maintenancerequest",
+      adminPermission: values.permissionMaintenanceTracking,
+      entityType: values.featureKey,
       entityId: this.props.job.id,
       entityName: this.props.job.title,
       site: this.state.job.site || this.state.job.location,
@@ -592,7 +648,7 @@ class RequestDetail extends Component {
       ref: this.commentReply,
       commentSection: this.commentSection,
       scrollView: this.scrollView,
-      entityType: "maintenancerequest",
+      entityType: values.featureKey,
       entityId: this.props.job.id,
       entityName: this.props.job.title,
       site: this.state.job.site || this.state.job.location
@@ -885,13 +941,37 @@ const styles = StyleSheet.create({
     fontSize: 24,
     marginLeft: 10,
     lineHeight: 24
+  },
+  customLabel: {
+    fontFamily: 'sf-bold',
+    fontSize: 14,
+    color: Colours.TEXT_DARKEST
+  },
+  customText: {
+    fontFamily: 'sf-regular',
+    fontSize: 16,
+    color: Colours.TEXT_DARKEST,
+    paddingVertical: 8
+  },
+  customStaticTitle: {
+    fontSize: 20,
+    fontFamily: 'sf-semibold',
+    color: Colours.TEXT_DARKEST,
+    marginBottom: 10
+  },
+  customStaticText: {
+    fontSize: 17,
+    fontFamily: 'sf-regular',
+    color: Colours.TEXT_DARKEST,
+    lineHeight: 24,
+    marginBottom: 10
   }
 });
 const mapStateToProps = state => {
   return {
     user: state.user,
     colourBrandingMain: Colours.getMainBrandingColourFromState(state),
-    jobs: state.jobs.jobs
+    jobs: state[values.reducerKey].jobs
   };
 };
 export default connect(mapStateToProps, {