feat: #1301 - simplify location in offer columns

vexl-it · Nov 5, 2024 · 44bbdcc · 44bbdcc
1 parent f9a4c00
commit 44bbdcc
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 7 deletions.
diff --git a/apps/location-service/src/utils/googleMapsApi/geocode.ts b/apps/location-service/src/utils/googleMapsApi/geocode.ts
@@ -6,12 +6,17 @@ import {
   type GetGeocodedCoordinatesRequest,
 } from '@vexl-next/rest-api/src/services/location/contracts'
 import axios from 'axios'
-import {Effect} from 'effect'
+import {Array, Effect, Option, pipe} from 'effect'
 
 interface GoogleGeocodeResponse {
   results: Array<{
     place_id: string
     formatted_address: string
+    address_components: Array<{
+      long_name: string
+      short_name: string
+      types: string[]
+    }>
     geometry: {
       location: {
         lat: number
@@ -31,6 +36,24 @@ interface GoogleGeocodeResponse {
   }>
 }
 
+// Just keep this just in case. Might be useful
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const findTypeInAddressComponents = (
+  type: string,
+  components: Array<{
+    long_name: string
+    short_name: string
+    types: string[]
+  }>
+): string | undefined =>
+  pipe(
+    Array.findFirst(components, (oneComponent) =>
+      oneComponent.types.includes(type)
+    ),
+    Option.map((one) => one.long_name),
+    Option.getOrElse(() => undefined)
+  )
+
 export const googleGeocode =
   (apiKey: string) =>
   ({

diff --git a/apps/mobile/src/components/OfferInfoPreview/components/BtcOfferColumns.tsx b/apps/mobile/src/components/OfferInfoPreview/components/BtcOfferColumns.tsx
@@ -16,6 +16,7 @@ import {
   PriceBigger,
   PriceText,
 } from '../columnsStyles'
+import {formatLocationForColumns} from '../utils'
 
 interface Props {
   offer: OfferInfo
@@ -114,9 +115,7 @@ function BtcOfferColumns({offer}: Props): JSX.Element {
           {offer.publicPart.paymentMethod
             .map((method) => {
               if (method === 'CASH') {
-                return offer.publicPart.location
-                  .map((one) => one.shortAddress)
-                  .join(', ')
+                return formatLocationForColumns(offer.publicPart.location)
               }
               if (method === 'REVOLUT') {
                 return t('offer.revolut')

diff --git a/apps/mobile/src/components/OfferInfoPreview/components/ProductAndOtherOfferColumns.tsx b/apps/mobile/src/components/OfferInfoPreview/components/ProductAndOtherOfferColumns.tsx
@@ -7,6 +7,7 @@ import pickupSvg from '../../images/pickupSvg'
 import spokenLanguagesSvg from '../../images/spokenLanguagesSvg'
 import mapTagSvg from '../../InsideRouter/components/MarketplaceScreen/images/mapTagSvg'
 import {InfoDivider, InfoItemContainer, InfoText} from '../columnsStyles'
+import {formatLocationForColumns} from '../utils'
 import FiatOrSats from './FiatOrSats'
 
 interface Props {
@@ -78,9 +79,7 @@ function ProductAndOtherOfferColumns({offer}: Props): JSX.Element {
               <SvgImage source={mapTagSvg} />
             </Stack>
             <InfoText>
-              {offer.publicPart.location
-                .map((one) => one.shortAddress)
-                .join(', ')}
+              {formatLocationForColumns(offer.publicPart.location)}
             </InfoText>
           </InfoItemContainer>
         </>

diff --git a/apps/mobile/src/components/OfferInfoPreview/utils.ts b/apps/mobile/src/components/OfferInfoPreview/utils.ts
@@ -0,0 +1,14 @@
+import {type OfferLocation} from '@vexl-next/domain/src/general/offers'
+
+export const formatLocationForColumns = (
+  location: readonly OfferLocation[]
+): string =>
+  location
+    .map((one) =>
+      one.address
+        .split(', ')
+        .slice(0, 2)
+        .map((one) => one.replace(/\d+/g, '').trim())
+        .join(', ')
+    )
+    .join('; ')