fix: For orgs show money spent instead of money received (#8337)

* fix: for orgs show money spent instead of money received * fix: change money spent to contributed * fix: make sure we re-use the format string
opencollective · Nov 10, 2022 · e8cec08 · e8cec08 · vercel · Nov 10, 2022
1 parent 71e5be8
commit e8cec08
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 15 deletions.
diff --git a/components/search-page/SearchCollectiveCard.js b/components/search-page/SearchCollectiveCard.js
@@ -73,21 +73,39 @@ const SearchCollectiveCard = ({ collective, ...props }) => {
                 )}
               </P>
 
-              {collective.stats.totalAmountReceived.valueInCents > 0 && (
-                <Box pb="6px">
-                  <Span fontSize="14px" fontWeight={700} color="black.900">
-                    <Currency
-                      currency={collective.stats.totalAmountReceived.currency}
-                      formatWithSeparators
-                      value={collective.stats.totalAmountReceived.valueInCents}
-                    />
-                  </Span>
-                  {` `}
-                  <Span fontSize="12px" fontWeight={400} color="black.700">
-                    <FormattedMessage defaultMessage="Money raised" />
-                  </Span>
-                </Box>
-              )}
+              {collective.type !== CollectiveType.ORGANIZATION &&
+                collective.stats.totalAmountReceived.valueInCents > 0 && (
+                  <Box pb="6px">
+                    <Span fontSize="14px" fontWeight={700} color="black.900">
+                      <Currency
+                        currency={collective.stats.totalAmountReceived.currency}
+                        formatWithSeparators
+                        value={collective.stats.totalAmountReceived.valueInCents}
+                      />
+                    </Span>
+                    {` `}
+                    <Span fontSize="12px" fontWeight={400} color="black.700">
+                      <FormattedMessage defaultMessage="Money raised" />
+                    </Span>
+                  </Box>
+                )}
+
+              {collective.type === CollectiveType.ORGANIZATION &&
+                Math.abs(collective.stats.totalAmountSpent.valueInCents) > 0 && (
+                  <Box pb="6px">
+                    <Span fontSize="14px" fontWeight={700} color="black.900">
+                      <Currency
+                        currency={collective.stats.totalAmountSpent.currency}
+                        formatWithSeparators
+                        value={Math.abs(collective.stats.totalAmountSpent.valueInCents)}
+                      />
+                    </Span>
+                    {` `}
+                    <Span fontSize="12px" fontWeight={400} color="black.700">
+                      <FormattedMessage id="AmountContributed" defaultMessage="Contributed" />
+                    </Span>
+                  </Box>
+                )}
             </React.Fragment>
           )}
           {collective.description && (
@@ -120,6 +138,10 @@ SearchCollectiveCard.propTypes = {
         valueInCents: PropTypes.number,
         currency: PropTypes.string,
       }),
+      totalAmountSpent: PropTypes.shape({
+        valueInCents: PropTypes.number,
+        currency: PropTypes.string,
+      }),
     }),
     host: PropTypes.shape({
       totalHostedCollectives: PropTypes.number,

diff --git a/pages/search.js b/pages/search.js
@@ -585,6 +585,10 @@ export const searchPageQuery = gql`
             currency
             valueInCents
           }
+          totalAmountSpent {
+            currency
+            valueInCents
+          }
         }
         ... on Organization {
           host {