From 1972944e7e7b0c1e08a4f5a6818f256735a29c93 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Tue, 10 Aug 2021 17:15:03 -0700
Subject: [PATCH 1/2] Merge pull request #4535 from
 Expensify/version-BUILD-75a1fe0b4ebfa1819ad1efa608a45aa8bd07e41b

(cherry picked from commit 2e79fe511c2e70916da2da9ac09a497abc90b781)
---
 android/app/build.gradle          | 4 ++--
 ios/ExpensifyCash/Info.plist      | 2 +-
 ios/ExpensifyCashTests/Info.plist | 2 +-
 package-lock.json                 | 2 +-
 package.json                      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 3bf2ca36686a..3011237b1118 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -150,8 +150,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001008300
-        versionName "1.0.83-0"
+        versionCode 1001008301
+        versionName "1.0.83-1"
     }
     splits {
         abi {
diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist
index fb734277d44c..bb9717379d1b 100644
--- a/ios/ExpensifyCash/Info.plist
+++ b/ios/ExpensifyCash/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.83.0</string>
+	<string>1.0.83.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist
index bf588f85cb9b..88bbe4843316 100644
--- a/ios/ExpensifyCashTests/Info.plist
+++ b/ios/ExpensifyCashTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.83.0</string>
+	<string>1.0.83.1</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index dc52a499f14f..9aa4ff708375 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "expensify.cash",
-  "version": "1.0.83-0",
+  "version": "1.0.83-1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d779c0c697ac..ea9a248c11ea 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "expensify.cash",
-  "version": "1.0.83-0",
+  "version": "1.0.83-1",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

From a7f5f9a0ebf5069ca5448e8fd432d335c022c4d0 Mon Sep 17 00:00:00 2001
From: Horus Lugo <horus@expensify.com>
Date: Tue, 10 Aug 2021 09:50:20 +0200
Subject: [PATCH 2/2] Merge pull request #4503 from parasharrajat/fix-alignment

fix: message alignment
(cherry picked from commit c9d2e750156e622ce14f9ea8123a87c7c4ac8118)
---
 .../InlineCodeBlock/index.native.js           | 22 +++++++++++--------
 src/components/RenderHTML/BaseRenderHTML.js   |  1 +
 src/styles/styles.js                          |  5 -----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/components/InlineCodeBlock/index.native.js b/src/components/InlineCodeBlock/index.native.js
index b8f71b680a4f..621247f68cce 100644
--- a/src/components/InlineCodeBlock/index.native.js
+++ b/src/components/InlineCodeBlock/index.native.js
@@ -4,21 +4,25 @@ import WrappedText from './WrappedText';
 import inlineCodeBlockPropTypes from './inlineCodeBlockPropTypes';
 
 const InlineCodeBlock = ({
+    TDefaultRenderer,
     defaultRendererProps,
     boxModelStyle,
     textStyle,
 }) => (
-    <WrappedText
-        textStyles={[textStyle]}
-        wordStyles={[
-            boxModelStyle,
-            styles.codeWordStyle,
-        ]}
-        // eslint-disable-next-line react/jsx-props-no-spreading
+    <TDefaultRenderer
+    // eslint-disable-next-line react/jsx-props-no-spreading
         {...defaultRendererProps}
     >
-        {defaultRendererProps.tnode.data}
-    </WrappedText>
+        <WrappedText
+            textStyles={[textStyle]}
+            wordStyles={[
+                boxModelStyle,
+                styles.codeWordStyle,
+            ]}
+        >
+            {defaultRendererProps.tnode.data}
+        </WrappedText>
+    </TDefaultRenderer>
 );
 
 InlineCodeBlock.propTypes = inlineCodeBlockPropTypes;
diff --git a/src/components/RenderHTML/BaseRenderHTML.js b/src/components/RenderHTML/BaseRenderHTML.js
index dcf7fbe53958..42058198ced7 100755
--- a/src/components/RenderHTML/BaseRenderHTML.js
+++ b/src/components/RenderHTML/BaseRenderHTML.js
@@ -227,6 +227,7 @@ const BaseRenderHTML = ({html, debug, textSelectable}) => {
     return (
         <HTML
             defaultTextProps={{selectable: textSelectable}}
+            defaultViewProps={{style: {alignItems: 'flex-start'}}}
             customHTMLElementModels={customHTMLElementModels}
             renderers={renderers}
             renderersProps={renderersProps}
diff --git a/src/styles/styles.js b/src/styles/styles.js
index 31d8103e433f..f4a91d1784a3 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -1900,10 +1900,6 @@ const webViewStyles = {
     // styles from the renderer, just pass the "style" prop to the underlying
     // component.
     tagStyles: {
-        body: {
-            flexDirection: 'row',
-        },
-
         em: {
             fontFamily: fontFamily.GTA_ITALIC,
             fontStyle: 'italic',
@@ -1969,7 +1965,6 @@ const webViewStyles = {
         lineHeight: variables.fontSizeNormalHeight,
         fontFamily: fontFamily.GTA,
         flex: 1,
-        alignSelf: 'flex-start',
     },
 };