Refactor createIOUTransaction to RequestMoney

src/CONST.js

@@ -656,6 +656,7 @@ const CONST = {
         },
         REPORT_ACTION_TYPE: {
             PAY: 'pay',
+            CREATE: 'create',
         },
         AMOUNT_MAX_LENGTH: 10,
     },

src/components/IOUBadge.js

@@ -24,8 +24,8 @@ const propTypes = {
 
 const defaultProps = {
     iouReport: {
-        reportID: 0,
-        chatReportID: 0,
+        reportID: '',
+        chatReportID: '',
         total: 0,
         ownerEmail: null,
         currency: CONST.CURRENCY.USD,

src/components/IOUConfirmationList.js

@@ -14,8 +14,6 @@ import ButtonWithMenu from './ButtonWithMenu';
 import Log from '../libs/Log';
 import SettlementButton from './SettlementButton';
 import ROUTES from '../ROUTES';
-import networkPropTypes from './networkPropTypes';
-import {withNetwork} from './OnyxProvider';
 import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsPropTypes, withCurrentUserPersonalDetailsDefaultProps} from './withCurrentUserPersonalDetails';
 
 const propTypes = {
@@ -79,9 +77,6 @@ const propTypes = {
         selectedCurrencyCode: PropTypes.string,
     }),
 
-    /** Information about the network */
-    network: networkPropTypes.isRequired,
-
     /** Current user session */
     session: PropTypes.shape({
         email: PropTypes.string.isRequired,
@@ -330,8 +325,7 @@ class IOUConfirmationList extends Component {
     render() {
         const selectedParticipants = this.getSelectedParticipants();
         const shouldShowSettlementButton = this.props.iouType === CONST.IOU.IOU_TYPE.SEND;
-        const shouldDisableButton = selectedParticipants.length === 0 || this.props.network.isOffline;
-        const isLoading = this.props.iou.loading && !this.props.network.isOffline;
+        const shouldDisableButton = selectedParticipants.length === 0;
         const recipient = this.state.participants[0];
         const canModifyParticipants = this.props.isIOUAttachedToExistingChatReport && this.props.hasMultipleParticipants;
         return (
@@ -357,7 +351,6 @@ class IOUConfirmationList extends Component {
                     ? (
                         <SettlementButton
                             isDisabled={shouldDisableButton}
-                            isLoading={isLoading}
                             onPress={this.confirm}
                             shouldShowPaypal={Boolean(recipient.payPalMeAddress)}
                             enablePaymentsRoute={ROUTES.IOU_SEND_ENABLE_PAYMENTS}
@@ -368,7 +361,6 @@ class IOUConfirmationList extends Component {
                     ) : (
                         <ButtonWithMenu
                             isDisabled={shouldDisableButton}
-                            isLoading={isLoading}
                             onPress={(_event, value) => this.confirm(value)}
                             options={this.splitOrRequestOptions}
                         />
@@ -384,7 +376,6 @@ IOUConfirmationList.defaultProps = defaultProps;
 export default compose(
     withLocalize,
     withWindowDimensions,
-    withNetwork(),
     withCurrentUserPersonalDetails,
     withOnyx({
         iou: {key: ONYXKEYS.IOU},

src/components/ReportActionItem/IOUAction.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
+import lodashGet from 'lodash/get';
 import ONYXKEYS from '../../ONYXKEYS';
 import IOUQuote from './IOUQuote';
 import reportActionPropTypes from '../../pages/home/report/reportActionPropTypes';
@@ -47,6 +48,7 @@ const IOUAction = (props) => {
             {((props.isMostRecentIOUReportAction && Boolean(props.action.originalMessage.IOUReportID))
                 || (props.action.originalMessage.type === 'pay')) && (
                     <IOUPreview
+                        pendingAction={lodashGet(props.action, 'pendingAction', null)}
                         iouReportID={props.action.originalMessage.IOUReportID.toString()}
                         chatReportID={props.chatReportID}
                         onPayButtonPressed={launchDetailsModal}

src/components/ReportActionItem/IOUPreview.js

@@ -81,6 +81,9 @@ const propTypes = {
     /** Information about the user accepting the terms for payments */
     walletTerms: walletTermsPropTypes,
 
+    /** Pending action, if any */
+    pendingAction: PropTypes.oneOf(_.values(CONST.RED_BRICK_ROAD_PENDING_ACTION)),
+
     ...withLocalizePropTypes,
 };
 
@@ -91,6 +94,7 @@ const defaultProps = {
     onPreviewPressed: () => {},
     containerStyles: [],
     walletTerms: {},
+    pendingAction: null,
 };
 
 const IOUPreview = (props) => {
@@ -132,7 +136,7 @@ const IOUPreview = (props) => {
                     ? <ActivityIndicator style={styles.iouPreviewBoxLoading} color={themeColors.text} />
                     : (
                         <OfflineWithFeedback
-                            pendingAction={CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD}
+                            pendingAction={props.pendingAction}
                             errors={props.walletTerms.errors}
                             onClose={() => {
                                 PaymentMethods.clearWalletTermsError();

src/components/ReportTransaction.js

@@ -15,11 +15,11 @@ import Button from './Button';
 const propTypes = {
     /** The chatReport which the transaction is associated with */
     /* eslint-disable-next-line react/no-unused-prop-types */
-    chatReportID: PropTypes.number.isRequired,
+    chatReportID: PropTypes.string.isRequired,
 
     /** ID for the IOU report */
     /* eslint-disable-next-line react/no-unused-prop-types */
-    iouReportID: PropTypes.number.isRequired,
+    iouReportID: PropTypes.string.isRequired,
 
     /** The report action which we are displaying */
     action: PropTypes.shape(reportActionPropTypes).isRequired,

src/languages/en.js

@@ -260,6 +260,7 @@ export default {
         error: {
             invalidSplit: 'Split amounts do not equal total amount',
             other: 'Unexpected error, please try again later',
+            genericCreateFailureMessage: 'Unexpected error requesting money, please try again later',
         },
     },
     notificationPreferences: {

src/languages/es.js

@@ -260,6 +260,7 @@ export default {
         error: {
             invalidSplit: 'La suma de las partes no equivale al monto total',
             other: 'Error inesperado, por favor inténtalo más tarde',
+            genericCreateFailureMessage: 'Error inesperado solicitando dinero, por favor inténtalo más tarde',
         },
     },
     notificationPreferences: {

src/libs/IOUUtils.js

@@ -0,0 +1,64 @@
+import CONST from '../CONST';
+
+/**
+ * Calculates the amount per user given a list of participants
+ * @param {Array} participants - List of logins for the participants in the chat. It should not include the current user's login.
+ * @param {Number} total - IOU total amount
+ * @param {Boolean} isDefaultUser - Whether we are calculating the amount for the current user
+ * @returns {Number}
+ */
+function calculateAmount(participants, total, isDefaultUser = false) {
+    // Convert to cents before working with iouAmount to avoid
+    // javascript subtraction with decimal problem -- when dealing with decimals,
+    // because they are encoded as IEEE 754 floating point numbers, some of the decimal
+    // numbers cannot be represented with perfect accuracy.
+    // Cents is temporary and there must be support for other currencies in the future
+    const iouAmount = Math.round(parseFloat(total * 100));
+    const totalParticipants = participants.length + 1;
+    const amountPerPerson = Math.round(iouAmount / totalParticipants);
+
+    if (!isDefaultUser) {
+        return amountPerPerson;
+    }
+
+    const sumAmount = amountPerPerson * totalParticipants;
+    const difference = iouAmount - sumAmount;
+
+    return iouAmount !== sumAmount ? (amountPerPerson + difference) : amountPerPerson;
+}
+
+/**
+ * The owner of the IOU report is the account who is owed money and the manager is the one who owes money!
+ * In case the owner/manager swap, we need to update the owner of the IOU report and the report total, since it is always positive.
+ * For example: if user1 owes user2 $10, then we have: {ownerEmail: user2, managerEmail: user1, total: $10 (a positive amount, owed to user2)}
+ * If user1 requests $17 from user2, then we have: {ownerEmail: user1, managerEmail: user2, total: $7 (still a positive amount, but now owed to user1)}
+ *
+ * @param {Object} iouReport
+ * @param {String} actorEmail
+ * @param {Number} amount
+ * @param {String} type
+ * @returns {Object}
+ */
+function updateIOUOwnerAndTotal(iouReport, actorEmail, amount, type = CONST.IOU.REPORT_ACTION_TYPE.CREATE) {
+    const iouReportUpdate = {...iouReport};
+
+    if (actorEmail === iouReport.ownerEmail) {
+        iouReportUpdate.total += type === CONST.IOU.REPORT_ACTION_TYPE.CANCEL ? -amount : amount;
+    } else {
+        iouReportUpdate.total += type === CONST.IOU.REPORT_ACTION_TYPE.CANCEL ? amount : -amount;
+    }
+
+    if (iouReportUpdate.total < 0) {
+        // The total sign has changed and hence we need to flip the manager and owner of the report.
+        iouReportUpdate.ownerEmail = iouReport.managerEmail;
+        iouReportUpdate.managerEmail = iouReport.ownerEmail;
+        iouReportUpdate.total = -iouReportUpdate.total;
+    }
+
+    return iouReportUpdate;
+}
+
+export {
+    calculateAmount,
+    updateIOUOwnerAndTotal,
+};

src/libs/ReportUtils.js

@@ -645,10 +645,19 @@ function buildOptimisticReportAction(sequenceNumber, text, file) {
     };
 }
 
-/*
+/**
  * Builds an optimistic IOU report with a randomly generated reportID
+ *
+ * @param {String} ownerEmail - Email of the person generating the IOU.
+ * @param {String} userEmail - Email of the other person participating in the IOU.
+ * @param {Number} total - IOU amount in cents.
+ * @param {String} chatReportID - Report ID of the chat where the IOU is.
+ * @param {String} currency - IOU currency.
+ * @param {String} locale - Locale where the IOU is created
+ *
+ * @returns {Object}
  */
-function buildOptimisticIOUReport(ownerEmail, recipientEmail, total, chatReportID, currency, locale) {
+function buildOptimisticIOUReport(ownerEmail, userEmail, total, chatReportID, currency, locale) {
     const formattedTotal = NumberFormatUtils.format(locale,
         total, {
             style: 'currency',
@@ -659,7 +668,7 @@ function buildOptimisticIOUReport(ownerEmail, recipientEmail, total, chatReportI
         chatReportID,
         currency,
         hasOutstandingIOU: true,
-        managerEmail: recipientEmail,
+        managerEmail: userEmail,
         ownerEmail,
         reportID: generateReportID(),
         state: CONST.REPORT.STATE.SUBMITTED,
@@ -674,17 +683,19 @@ function buildOptimisticIOUReport(ownerEmail, recipientEmail, total, chatReportI
  * @param {Number} sequenceNumber - Caller is responsible for providing a best guess at what the next sequenceNumber will be.
  * @param {String} type - IOUReportAction type. Can be oneOf(create, decline, cancel, pay).
  * @param {Number} amount - IOU amount in cents.
+ * @param {String} currency - IOU currency.
  * @param {String} comment - User comment for the IOU.
  * @param {String} paymentType - Only required if the IOUReportAction type is 'pay'. Can be oneOf(elsewhere, payPal, Expensify).
- * @param {String} existingIOUTransactionID - Only required if the IOUReportAction type is oneOf(cancel, decline). Generates a randomID as default.
- * @param {Number} existingIOUReportID - Only required if the IOUReportActions type is oneOf(decline, cancel, pay). Generates a randomID as default.
+ * @param {String} iouTransactionID - Only required if the IOUReportAction type is oneOf(cancel, decline). Generates a randomID as default.
+ * @param {String} iouReportID - Only required if the IOUReportActions type is oneOf(decline, cancel, pay). Generates a randomID as default.
+ * @param {String} debtorEmail - Email of the user that has to pay
+ * @param {String} locale - Locale of the user
  *
  * @returns {Object}
  */
-function buildOptimisticIOUReportAction(sequenceNumber, type, amount, comment, paymentType = '', existingIOUTransactionID = '', existingIOUReportID = 0) {
-    const currency = lodashGet(currentUserPersonalDetails, 'localCurrencyCode');
-    const IOUTransactionID = existingIOUTransactionID || NumberUtils.rand64();
-    const IOUReportID = existingIOUReportID || generateReportID();
+function buildOptimisticIOUReportAction(sequenceNumber, type, amount, currency, comment, paymentType = '', iouTransactionID = '', iouReportID = '', debtorEmail = '', locale = 'en') {
+    const IOUTransactionID = iouTransactionID || NumberUtils.rand64();
+    const IOUReportID = iouReportID || generateReportID();
     const originalMessage = {
         amount,
         comment,
@@ -693,6 +704,17 @@ function buildOptimisticIOUReportAction(sequenceNumber, type, amount, comment, p
         IOUReportID,
         type,
     };
+    const formattedTotal = NumberFormatUtils.format(locale,
+        amount / 100, {
+            style: 'currency',
+            currency,
+        });
+    const message = [{
+        type: CONST.REPORT.MESSAGE.TYPE.COMMENT,
+        isEdited: false,
+        html: comment ? `Requested ${formattedTotal} from ${debtorEmail} for ${comment}` : `Requested ${formattedTotal} from ${debtorEmail}`,
+        text: comment ? `Requested ${formattedTotal} from ${debtorEmail} for ${comment}` : `Requested ${formattedTotal} from ${debtorEmail}`,
+    }];
 
     // We store amount, comment, currency in IOUDetails when type = pay
     if (type === CONST.IOU.REPORT_ACTION_TYPE.PAY) {
@@ -711,6 +733,7 @@ function buildOptimisticIOUReportAction(sequenceNumber, type, amount, comment, p
         avatar: lodashGet(currentUserPersonalDetails, 'avatar', getDefaultAvatar(currentUserEmail)),
         clientID: NumberUtils.generateReportActionClientID(),
         isAttachment: false,
+        message,
         originalMessage,
         person: [{
             style: 'strong',