Update to reflect recent standards and Web-E changes

Author: marcaaron

src/libs/actions/Report.js

@@ -919,7 +919,7 @@ function addComment(reportID, text, file) {
             isFirstItem: false,
             isAttachment,
             attachmentInfo,
-            isPending: true,
+            isLoading: true,
             shouldShow: true,
         },
     };
@@ -961,15 +961,15 @@ function addComment(reportID, text, file) {
         DateUtils.setTimezoneUpdated();
     }
 
-    API.write(isAttachment ? 'AddAttachmentWithOptionalComment' : 'AddComment', parameters, {
+    API.write(isAttachment ? 'AddAttachment' : 'AddComment', parameters, {
         optimisticData,
         failureData: [
             {
                 onyxMethod: CONST.ONYX.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
                 value: {
                     [optimisticReportActionID]: {
-                        isPending: false,
+                        isLoading: false,
                     },
                 },
             },
@@ -981,7 +981,7 @@ function addComment(reportID, text, file) {
  * @param {Number} reportID
  * @param {Object} file
  */
-function addAttachmentWithOptionalComment(reportID, file) {
+function addAttachment(reportID, file) {
     addComment(reportID, '', file);
 }
 
@@ -1494,7 +1494,7 @@ export {
     fetchIOUReportByID,
     fetchIOUReportByIDAndUpdateChatReport,
     addComment,
-    addAttachmentWithOptionalComment,
+    addAttachment,
     updateLastReadActionID,
     updateNotificationPreference,
     setNewMarkerPosition,

src/libs/actions/ReportActions.js

@@ -34,7 +34,7 @@ Onyx.connect({
         const reportID = CollectionUtils.extractCollectionItemID(key);
         const actionsArray = _.toArray(actions);
         reportActions[reportID] = actionsArray;
-        const mostRecentNonLoadingActionIndex = _.findLastIndex(actionsArray, action => !action.isPending);
+        const mostRecentNonLoadingActionIndex = _.findLastIndex(actionsArray, action => !action.isLoading);
         const mostRecentAction = actionsArray[mostRecentNonLoadingActionIndex];
         if (!mostRecentAction || _.isUndefined(mostRecentAction.sequenceNumber)) {
             return;

src/pages/home/report/ReportActionCompose.js

@@ -495,7 +495,7 @@ class ReportActionCompose extends React.Component {
                         headerTitle={this.props.translate('reportActionCompose.sendAttachment')}
                         onConfirm={(file) => {
                             this.submitForm();
-                            Report.createAttachment(this.props.reportID, file);
+                            Report.addAttachment(this.props.reportID, file);
                             this.setTextInputShouldClear(false);
                         }}
                     >

src/pages/home/report/ReportActionItem.js

@@ -175,7 +175,7 @@ class ReportActionItem extends Component {
                                     hovered
                                     || this.state.isContextMenuActive
                                     || this.props.draftMessage,
-                                    (this.props.network.isOffline && this.props.action.isPending) || this.props.action.error,
+                                    (this.props.network.isOffline && this.props.action.isLoading) || this.props.action.error,
                                 )}
                             >
                                 {!this.props.displayAsGroup

src/pages/home/report/ReportActionItemMessage.js

@@ -22,7 +22,7 @@ const propTypes = {
 };
 
 const ReportActionItemMessage = (props) => {
-    const isUnsent = props.network.isOffline && props.action.isPending;
+    const isUnsent = props.network.isOffline && props.action.isLoading;
 
     return (
         <View style={[styles.chatItemMessage, isUnsent && styles.chatItemUnsentMessage]}>
@@ -32,7 +32,7 @@ const ReportActionItemMessage = (props) => {
                     fragment={fragment}
                     isAttachment={props.action.isAttachment}
                     attachmentInfo={props.action.attachmentInfo}
-                    loading={props.action.isPending}
+                    loading={props.action.isLoading}
                 />
             ))}
         </View>

src/pages/home/report/ReportActionItemSingle.js

@@ -92,7 +92,7 @@ const ReportActionItemSingle = (props) => {
                                     fragment={fragment}
                                     tooltipText={props.action.actorEmail}
                                     isAttachment={props.action.isAttachment}
-                                    isLoading={props.action.isPending}
+                                    isLoading={props.action.isLoading}
                                     isSingleLine
                                 />
                             ))}

src/pages/home/report/reportActionPropTypes.js

@@ -25,7 +25,7 @@ export default {
     }),
 
     /** Whether we have received a response back from the server */
-    isPending: PropTypes.bool,
+    isLoading: PropTypes.bool,
 
     /** Error message that's come back from the server. */
     error: PropTypes.string,

src/styles/StyleUtils.js

@@ -387,10 +387,10 @@ function getLoginPagePromoStyle() {
  * Generate the styles for the ReportActionItem wrapper view.
  *
  * @param {Boolean} [isHovered]
- * @param {Boolean} [isPending]
+ * @param {Boolean} [isLoading]
  * @returns {Object}
  */
-function getReportActionItemStyle(isHovered = false, isPending = false) {
+function getReportActionItemStyle(isHovered = false, isLoading = false) {
     return {
         display: 'flex',
         justifyContent: 'space-between',
@@ -399,7 +399,7 @@ function getReportActionItemStyle(isHovered = false, isPending = false) {
 
             // Warning: Setting this to a non-transparent color will cause unread indicator to break on Android
             : colors.transparent,
-        opacity: isPending ? 0.5 : 1,
+        opacity: isLoading ? 0.5 : 1,
         cursor: 'default',
     };
 }

tests/actions/ReportTest.js

@@ -101,7 +101,7 @@ describe('actions/Report', () => {
                 clientID = resultAction.sequenceNumber;
                 expect(resultAction.message).toEqual(REPORT_ACTION.message);
                 expect(resultAction.person).toEqual(REPORT_ACTION.person);
-                expect(resultAction.isPending).toEqual(true);
+                expect(resultAction.isLoading).toEqual(true);
 
                 // We subscribed to the Pusher channel above and now we need to simulate a reportComment action
                 // Pusher event so we can verify that action was handled correctly and merged into the reportActions.
@@ -141,7 +141,7 @@ describe('actions/Report', () => {
                 const resultAction = reportActions[ACTION_ID];
 
                 // Verify that our action is no longer in the loading state
-                expect(resultAction.isPending).not.toBeDefined();
+                expect(resultAction.isLoading).not.toBeDefined();
             });
     });