@@ -1864,13 +1864,13 @@ function setIndividualShare(transactionID: string, participantAccountID: number,
18641864/**
18651865 * Calculate merchant for distance transactions based on distance and rate
18661866 */
1867- function getDistanceMerchantFromDistance ( distanceInUnits : number , unit : Unit | undefined , rate : number | undefined , currency : string , transactionCurrency ?: string ) : string {
1867+ function getDistanceMerchantFromDistance ( distanceInUnits : number , unit : Unit | undefined , rate : number | undefined , currency : string ) : string {
18681868 if ( ! rate || rate <= 0 || ! unit ) {
18691869 return '' ;
18701870 }
18711871
18721872 const distanceInMeters = DistanceRequestUtils . convertToDistanceInMeters ( distanceInUnits , unit ) ;
1873- const currencyForMerchant = currency ?? transactionCurrency ?? CONST . CURRENCY . USD ;
1873+ const currencyForMerchant = currency ;
18741874 const currentLocale = IntlStore . getCurrentLocale ( ) ;
18751875 return DistanceRequestUtils . getDistanceMerchant (
18761876 true ,
@@ -1911,7 +1911,7 @@ function updateSplitExpenseDistanceFromAmount(
19111911 quantity,
19121912 } ;
19131913
1914- const merchant = getDistanceMerchantFromDistance ( distanceInUnits , unit , rate , mileageRate ?. currency ?? transactionCurrency ?? CONST . CURRENCY . USD , transactionCurrency ) ;
1914+ const merchant = getDistanceMerchantFromDistance ( distanceInUnits , unit , rate , transactionCurrency ?? mileageRate ?. currency ?? CONST . CURRENCY . USD ) ;
19151915
19161916 return { customUnit, merchant} ;
19171917}
@@ -2339,8 +2339,8 @@ function updateSplitExpenseField(
23392339 updatedItem . amount = calculatedAmount ;
23402340
23412341 // Update merchant for distance transactions
2342- const currency = mileageRate ? .currency ?? originalTransaction . currency ?? CONST . CURRENCY . USD ;
2343- updatedItem . merchant = getDistanceMerchantFromDistance ( distanceInUnits , unit , rate , currency , originalTransaction . currency ) ;
2342+ const currency = originalTransaction . currency ?? mileageRate ? .currency ?? CONST . CURRENCY . USD ;
2343+ updatedItem . merchant = getDistanceMerchantFromDistance ( distanceInUnits , unit , rate , currency ) ;
23442344 }
23452345 }
23462346 }
0 commit comments