Merge pull request #22662 from Expensify/stites-fixFrequentlyUsedEmojis

(cherry picked from commit 1a4190b)

android/app/build.gradle

@@ -106,8 +106,13 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
+<<<<<<< HEAD
         versionCode 1001033907
         versionName "1.3.39-7"
+=======
+        versionCode 1001033905
+        versionName "1.3.39-5"
+>>>>>>> 1a4190b (Merge pull request #22662 from Expensify/stites-fixFrequentlyUsedEmojis)
     }
 
     splits {

ios/NewExpensify/Info.plist

@@ -32,7 +32,11 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
+<<<<<<< HEAD
 	<string>1.3.39.7</string>
+=======
+	<string>1.3.39.5</string>
+>>>>>>> 1a4190b (Merge pull request #22662 from Expensify/stites-fixFrequentlyUsedEmojis)
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,10 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
+<<<<<<< HEAD
 	<string>1.3.39.7</string>
+=======
+	<string>1.3.39.5</string>
+>>>>>>> 1a4190b (Merge pull request #22662 from Expensify/stites-fixFrequentlyUsedEmojis)
 </dict>
 </plist>

package.json

@@ -1,6 +1,10 @@
 {
   "name": "new.expensify",
+<<<<<<< HEAD
   "version": "1.3.39-7",
+=======
+  "version": "1.3.39-5",
+>>>>>>> 1a4190b (Merge pull request #22662 from Expensify/stites-fixFrequentlyUsedEmojis)
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

src/components/ReportActionItem/ReportPreview.js

@@ -104,7 +104,11 @@ function ReportPreview(props) {
                 accessibilityRole="button"
                 accessibilityLabel={props.translate('iou.viewDetails')}
             >
+<<<<<<< HEAD
                 <View style={styles.iouPreviewBox}>
+=======
+                <View style={[styles.iouPreviewBox, props.isHovered ? styles.iouPreviewBoxHover : undefined]}>
+>>>>>>> 1a4190b (Merge pull request #22662 from Expensify/stites-fixFrequentlyUsedEmojis)
                     <View style={styles.flexRow}>
                         <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}>
                             <Text style={[styles.textLabelSupporting, styles.mb1, styles.lh16]}>

src/components/UserDetailsTooltip/index.web.js

@@ -51,7 +51,11 @@ function UserDetailsTooltip(props) {
                     />
                 </View>
                 <Text style={[styles.mt2, styles.textMicroBold, styles.textReactionSenders, styles.textAlignCenter]}>{title}</Text>
+<<<<<<< HEAD
                 <Text style={[styles.textMicro, styles.fontColorReactionLabel]}>{subtitle}</Text>
+=======
+                <Text style={[styles.textMicro, styles.fontColorReactionLabel, styles.breakWord, styles.textAlignCenter]}>{subtitle}</Text>
+>>>>>>> 1a4190b (Merge pull request #22662 from Expensify/stites-fixFrequentlyUsedEmojis)
             </View>
         ),
         [props.icon, userAvatar, userAccountID, userLogin, title, subtitle],

src/languages/en.js

@@ -567,7 +567,11 @@ export default {
     },
     twoFactorAuthForm: {
         error: {
+<<<<<<< HEAD
             pleaseFillTwoFactorAuth: 'Please enter your two-factor code',
+=======
+            pleaseFillTwoFactorAuth: 'Please enter your two-factor authentication code',
+>>>>>>> 1a4190b (Merge pull request #22662 from Expensify/stites-fixFrequentlyUsedEmojis)
             incorrect2fa: 'Incorrect two-factor authentication code. Please try again.',
         },
     },
@@ -712,7 +716,11 @@ export default {
         error: {
             pleaseFillMagicCode: 'Please enter your magic code',
             incorrectMagicCode: 'Incorrect magic code.',
+<<<<<<< HEAD
             pleaseFillTwoFactorAuth: 'Please enter your two-factor code',
+=======
+            pleaseFillTwoFactorAuth: 'Please enter your two-factor authentication code',
+>>>>>>> 1a4190b (Merge pull request #22662 from Expensify/stites-fixFrequentlyUsedEmojis)
         },
     },
     passwordForm: {
@@ -1294,6 +1302,10 @@ export default {
             completed: 'completed task',
             canceled: 'canceled task',
             reopened: 'reopened task',
+<<<<<<< HEAD
+=======
+            error: 'You do not have the permission to do the requested action.',
+>>>>>>> 1a4190b (Merge pull request #22662 from Expensify/stites-fixFrequentlyUsedEmojis)
         },
         markAsDone: 'Mark as done',
         markAsIncomplete: 'Mark as incomplete',

src/languages/es.js

@@ -568,7 +568,11 @@ export default {
     },
     twoFactorAuthForm: {
         error: {
+<<<<<<< HEAD
             pleaseFillTwoFactorAuth: 'Por favor, introduce tu código 2 factores',
+=======
+            pleaseFillTwoFactorAuth: 'Por favor, introduce tu código de autenticación de dos factores',
+>>>>>>> 1a4190b (Merge pull request #22662 from Expensify/stites-fixFrequentlyUsedEmojis)
             incorrect2fa: 'Código de autenticación de dos factores incorrecto. Por favor, inténtalo de nuevo',
         },
     },
@@ -714,7 +718,11 @@ export default {
         error: {
             pleaseFillMagicCode: 'Por favor, introduce el código mágico',
             incorrectMagicCode: 'Código mágico incorrecto.',
+<<<<<<< HEAD
             pleaseFillTwoFactorAuth: 'Por favor, introduce tu código 2 factores',
+=======
+            pleaseFillTwoFactorAuth: 'Por favor, introduce tu código de autenticación de dos factores',
+>>>>>>> 1a4190b (Merge pull request #22662 from Expensify/stites-fixFrequentlyUsedEmojis)
         },
     },
     passwordForm: {
@@ -1302,7 +1310,12 @@ export default {
         messages: {
             completed: 'tarea completada',
             canceled: 'tarea cancelada',
+<<<<<<< HEAD
             reopened: 'tarea reabierta',
+=======
+            reopened: 'tarea reabrir',
+            error: 'No tiene permiso para realizar la acción solicitada.',
+>>>>>>> 1a4190b (Merge pull request #22662 from Expensify/stites-fixFrequentlyUsedEmojis)
         },
         markAsDone: 'Marcar como completada',
         markAsIncomplete: 'Marcar como incompleta',

src/libs/EmojiUtils.js

@@ -14,7 +14,11 @@ Onyx.connect({
         frequentlyUsedEmojis = _.map(val, (item) => {
             const emoji = Emojis.emojiCodeTable[item.code];
             if (emoji) {
+<<<<<<< HEAD
                 return {name: emoji.name, code: emoji.code, count: item.count, lastUpdatedAt: item.lastUpdatedAt};
+=======
+                return {...emoji, count: item.count, lastUpdatedAt: item.lastUpdatedAt};
+>>>>>>> 1a4190b (Merge pull request #22662 from Expensify/stites-fixFrequentlyUsedEmojis)
             }
         });
     },
@@ -228,8 +232,12 @@ function getFrequentlyUsedEmojis(newEmoji) {
             frequentEmojiList.splice(emojiIndex, 1);
         }
 
+<<<<<<< HEAD
         const {name, code} = Emojis.emojiCodeTable[emoji.code];
         const updatedEmoji = {name, code, count: currentEmojiCount, lastUpdatedAt: currentTimestamp};
+=======
+        const updatedEmoji = {...Emojis.emojiCodeTable[emoji.code], count: currentEmojiCount, lastUpdatedAt: currentTimestamp};
+>>>>>>> 1a4190b (Merge pull request #22662 from Expensify/stites-fixFrequentlyUsedEmojis)
 
         // We want to make sure the current emoji is added to the list
         // Hence, we take one less than the current frequent used emojis

src/libs/ReportUtils.js

@@ -1081,10 +1081,17 @@ function getTransactionReportName(reportAction) {
  * Get money request message for an IOU report
  *
  * @param {Object} report
+<<<<<<< HEAD
  * @param {Object} reportAction
  * @returns  {String}
  */
 function getReportPreviewMessage(report, reportAction) {
+=======
+ * @param {Object} [reportAction={}]
+ * @returns  {String}
+ */
+function getReportPreviewMessage(report, reportAction = {}) {
+>>>>>>> 1a4190b (Merge pull request #22662 from Expensify/stites-fixFrequentlyUsedEmojis)
     const reportActionMessage = lodashGet(reportAction, 'message[0].html', '');
 
     if (_.isEmpty(report) || !report.reportID) {
@@ -1561,6 +1568,7 @@ function buildOptimisticIOUReportAction(type, amount, currency, comment, partici
     };
 }
 
+<<<<<<< HEAD
 function buildOptimisticReportPreview(reportID, iouReportID, payeeAccountID) {
     return {
         reportActionID: NumberUtils.rand64(),
@@ -1573,14 +1581,36 @@ function buildOptimisticReportPreview(reportID, iouReportID, payeeAccountID) {
             {
                 html: '',
                 text: '',
+=======
+function buildOptimisticReportPreview(chatReport, iouReport) {
+    const message = getReportPreviewMessage(iouReport);
+    return {
+        reportActionID: NumberUtils.rand64(),
+        reportID: chatReport.reportID,
+        actionName: CONST.REPORT.ACTIONS.TYPE.REPORTPREVIEW,
+        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+        originalMessage: {
+            linkedReportID: iouReport.reportID,
+        },
+        message: [
+            {
+                html: message,
+                text: message,
+>>>>>>> 1a4190b (Merge pull request #22662 from Expensify/stites-fixFrequentlyUsedEmojis)
                 isEdited: false,
                 type: CONST.REPORT.MESSAGE.TYPE.COMMENT,
             },
         ],
+<<<<<<< HEAD
         originalMessage: {
             linkedReportID: iouReportID,
         },
         actorAccountID: currentUserAccountID,
+=======
+        created: DateUtils.getDBTime(),
+        accountID: iouReport.managerID || 0,
+        actorAccountID: iouReport.managerID || 0,
+>>>>>>> 1a4190b (Merge pull request #22662 from Expensify/stites-fixFrequentlyUsedEmojis)
     };
 }