Fix the settled preview message

src/CONST.js

@@ -603,6 +603,7 @@ const CONST = {
             OPEN: 0,
             PROCESSING: 1,
             SUBMITTED: 2,
+            BILLING: 3,
         },
         STATUS: {
             OPEN: 0,

src/languages/en.js

@@ -377,8 +377,9 @@ export default {
         payerPaidAmount: ({payer, amount}) => `${payer} paid ${amount}`,
         payerPaid: ({payer}) => `${payer} paid: `,
         payerSettled: ({amount}) => `paid ${amount}`,
-        settledElsewhereWithAmount: ({amount}) => `paid ${amount} elsewhere`,
-        settledPaypalMeWithAmount: ({amount}) => `paid ${amount} using Paypal.me`,
+        paidElsewhereWithAmount: ({amount}) => `paid ${amount} elsewhere`,
+        paidUsingPaypalWithAmount: ({amount}) => `paid ${amount} using Paypal.me`,
+        paidUsingExpensifyWithAmount: ({amount}) => `paid ${amount} using Expensify`,
         noReimbursableExpenses: 'This report has an invalid amount',
         pendingConversionMessage: "Total will update when you're back online",
         threadRequestReportName: ({formattedAmount, comment}) => `${formattedAmount} request${comment ? ` for ${comment}` : ''}`,

src/languages/es.js

@@ -376,8 +376,9 @@ export default {
         payerPaidAmount: ({payer, amount}) => `${payer} pagó ${amount}`,
         payerPaid: ({payer}) => `${payer} pagó: `,
         payerSettled: ({amount}) => `pagó ${amount}`,
-        settledElsewhereWithAmount: ({amount}) => `pagó ${amount} de otra forma`,
-        settledPaypalMeWithAmount: ({amount}) => `pagó ${amount} con PayPal.me`,
+        paidElsewhereWithAmount: ({amount}) => `pagó ${amount} de otra forma`,
+        paidUsingPaypalWithAmount: ({amount}) => `pagó ${amount} con PayPal.me`,
+        paidUsingExpensifyWithAmount: ({amount}) => `pagó ${amount} con Expensify`,
         noReimbursableExpenses: 'El monto de este informe es inválido',
         pendingConversionMessage: 'El total se actualizará cuando estés online',
         threadRequestReportName: ({formattedAmount, comment}) => `Solicitud de ${formattedAmount}${comment ? ` para ${comment}` : ''}`,

src/libs/ReportUtils.js

@@ -1105,9 +1105,13 @@ function getReportPreviewMessage(report, reportAction = {}) {
     const formattedAmount = CurrencyUtils.convertToDisplayString(totalAmount, report.currency);
 
     if (isSettled(report.reportID)) {
-        // A settled message is in the format of either "paid $1.00 elsewhere" or "paid $1.00 using Paypal.me"
-        const isSettledPaypalMe = Boolean(reportActionMessage.match(/ Paypal.me$/));
-        const translatePhraseKey = isSettledPaypalMe ? 'iou.settledPaypalMeWithAmount' : 'iou.settledElsewhereWithAmount';
+        // A settled report preview message can come in three formats "paid ... using Paypal.me", "paid ... elsewhere" or "paid ... using Expensify"
+        let translatePhraseKey = 'iou.paidElsewhereWithAmount';
+        if (reportActionMessage.match(/ Paypal.me$/)) {
+            translatePhraseKey = 'iou.paidUsingPaypalWithAmount';
+        } else if (reportActionMessage.match(/ using Expensify$/)) {
+            translatePhraseKey = 'iou.paidUsingExpensifyWithAmount';
+        }
         return Localize.translateLocal(translatePhraseKey, {amount: formattedAmount});
     }
     return Localize.translateLocal('iou.payerOwesAmount', {payer: payerName, amount: formattedAmount});
@@ -1533,12 +1537,15 @@ function buildOptimisticExpenseReport(chatReportID, policyID, payeeAccountID, to
  */
 function getIOUReportActionMessage(type, total, comment, currency, paymentType = '', isSettlingUp = false) {
     const currencyUnit = CurrencyUtils.getCurrencyUnit(currency);
-    const amount = NumberFormatUtils.format(preferredLocale, total / currencyUnit, {style: 'currency', currency});
+    const amount = NumberFormatUtils.format(preferredLocale, Math.abs(total) / currencyUnit, {style: 'currency', currency});
     let paymentMethodMessage;
     switch (paymentType) {
         case CONST.IOU.PAYMENT_TYPE.ELSEWHERE:
             paymentMethodMessage = ' elsewhere';
             break;
+        case CONST.IOU.PAYMENT_TYPE.VBBA:
+            paymentMethodMessage = ' using Expensify';
+            break;
         default:
             paymentMethodMessage = ` using ${paymentType}`;
             break;