Fix billing info position in request body

ikprk · Jul 2, 2024 · 932af82 · 932af82
1 parent 299693e
commit 932af82
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/packages/atlas/src/components/GuardarianModal/steps/GuardarianModalBillingInfoStep.tsx b/packages/atlas/src/components/GuardarianModal/steps/GuardarianModalBillingInfoStep.tsx
@@ -168,7 +168,7 @@ export const GuardarianModalBillingInfoStep = ({
             required: 'Field is required',
           }}
           render={({ field: { onChange, value } }) => {
-            const selected = countriesOptions?.find((row) => row.code_iso_alpha_3 === value)
+            const selected = countriesOptions?.find((row) => row.code_iso_alpha_2 === value)
             return (
               <FormField error={errors.country?.message} label="Select your country">
                 <ComboBox
@@ -177,7 +177,7 @@ export const GuardarianModalBillingInfoStep = ({
                   selectedItem={selected}
                   placeholder="Poland"
                   onSelectedItemChange={(e) => {
-                    onChange(e?.code_iso_alpha_3)
+                    onChange(e?.code_iso_alpha_2)
                   }}
                   items={countriesOptions}
                 />

diff --git a/packages/atlas/src/utils/GuardarianService/GuardarianService.ts b/packages/atlas/src/utils/GuardarianService/GuardarianService.ts
@@ -8,6 +8,8 @@ import {
   GuardarianEstimation,
 } from './GuardarianService.types'
 
+import { formatDateGuardarian } from '../time'
+
 type TransactionType = 'sell' | 'buy'
 
 // export const JOYSTREAM_CHANGENOW_TICKER = 'joystream'
@@ -144,7 +146,6 @@ class GuardarianService {
       dob: string
     }
   }) {
-    console.log('inside', from, to)
     return axiosInstance.post<GuardarianCreateTransactionResponse>(
       `${GUARDARIAN_URL}/transaction`,
       {
@@ -156,16 +157,21 @@ class GuardarianService {
         payout_info: {
           extra_id: extraId,
         },
-        billing_info: {
-          country_alpha_2: billingInfo.country,
-          region: billingInfo.region,
-          city: billingInfo.city,
-          street_address: billingInfo.street,
-          apt_number: billingInfo.apartment,
-          post_index: billingInfo.postIndex,
-          first_name: billingInfo.firstName,
-          last_name: billingInfo.lastName,
-          date_of_birthday: billingInfo.dob,
+        customer: {
+          contact_info: {
+            email: billingInfo.email,
+          },
+          billing_info: {
+            country_alpha_2: billingInfo.country,
+            region: billingInfo.region,
+            city: billingInfo.city,
+            street_address: billingInfo.street,
+            apt_number: billingInfo.apartment,
+            post_index: billingInfo.postIndex,
+            first_name: billingInfo.firstName,
+            last_name: billingInfo.lastName,
+            date_of_birthday: formatDateGuardarian(new Date(billingInfo.dob)),
+          },
         },
       },
       {

diff --git a/packages/atlas/src/utils/time.ts b/packages/atlas/src/utils/time.ts
@@ -6,6 +6,7 @@ const MINUTES_IN_HOUR = 60
 const SECONDS_IN_HOUR = MINUTES_IN_HOUR * 60
 
 export const formatDate = (date: Date) => format(date, 'd MMM yyyy')
+export const formatDateGuardarian = (date: Date) => format(date, 'dd:MM:yyyy')
 export const formatTime = (date: Date) => format(date, 'HH:mm')
 export const formatDateTime = (date: Date) => format(date, 'd MMM yyyy, HH:mm')
 export const formatDateTimeAt = (date: Date) => format(date, "d MMM yyyy 'at' HH:mm")