Merge branch 'HIN-1187-display-all-conflictOfInterest-fields' into 'develop'

fix(manuscriptMetadata): display all conflict of interests fields

See merge request !188

packages/component-faraday-ui/src/manuscriptDetails/ManuscriptMetadata.js

@@ -5,6 +5,7 @@ import { withProps } from 'recompose'
 import {
   Text,
   Item,
+  Row,
   ContextualBox,
   ManuscriptFileList,
 } from 'pubsweet-component-faraday-ui'
@@ -24,7 +25,7 @@ const ManuscriptMetadata = ({
           startExpanded
           transparent
         >
-          <Text mb={1} mt={1} whiteSpace="pre-wrap">
+          <Text mb={1} mt={1}>
             {abstract}
           </Text>
         </ContextualBox>
@@ -37,9 +38,30 @@ const ManuscriptMetadata = ({
           label="Conflict of Interest"
           transparent
         >
-          <Text mb={1} mt={1}>
-            {get(conflicts, 'message', '')}
-          </Text>
+          <Row alignItems="center" justify="flex-start">
+            <Text mb={1} mt={1}>
+              Conflicts of interest:
+            </Text>
+            <Text ml={1 / 2}>{get(conflicts, 'message', '')}</Text>
+          </Row>
+          {get(conflicts, 'dataAvailabilityMessage', '') && (
+            <Row alignItems="center" justify="flex-start">
+              <Text mb={1} mt={1}>
+                Data availability statment:
+              </Text>
+              <Text ml={1 / 2}>
+                {get(conflicts, 'dataAvailabilityMessage', '')}
+              </Text>
+            </Row>
+          )}
+          {get(conflicts, 'fundingMessage', '') && (
+            <Row alignItems="center" justify="flex-start">
+              <Text mb={1} mt={1}>
+                Funding statment:
+              </Text>
+              <Text ml={1 / 2}>{get(conflicts, 'fundingMessage', '')}</Text>
+            </Row>
+          )}
         </ContextualBox>
       </Item>
     )}