Merge pull request #1405 from MetaPhase-Consulting/update/ab-integrat…

…ion-fixes-2 no country or no city or no both
MetaPhase-Consulting · Mar 16, 2021 · 357e215 · 357e215
2 parents 049211e + fb22d25
commit 357e215
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Components/AvailableBidder/AvailableBidderRow/AvailableBidderRow.jsx b/src/Components/AvailableBidder/AvailableBidderRow/AvailableBidderRow.jsx
@@ -96,8 +96,12 @@ const AvailableBidderRow = (props) => {
     if (get(loc, 'state') === 'DC') return get(bidder, 'current_assignment.position.organization');
     // Domestic outside of DC - City, State
     if (get(loc, 'country') === 'USA') return `${get(loc, 'city')}, ${get(loc, 'state')}`;
+    if (!get(loc, 'city') && !get(loc, 'country')) return '';
     // Foreign posts - City, Country
-    return `${get(loc, 'city')}, ${get(loc, 'country')}`;
+    let x = `${get(loc, 'city')}, ${get(loc, 'country')}`;
+    if (!get(loc, 'city')) { x = get(loc, 'country'); }
+    if (!get(loc, 'country')) { x = get(loc, 'city'); }
+    return x;
   };
 
   const getCDO = () => (