Merge pull request #4536 from Expensify/cherry-pick-staging-4503

Expensify · Aug 11, 2021 · bb45fad · bb45fad
2 parents bbbf454 + a7f5f9a
commit bb45fad
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 20 deletions.
diff --git 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
@@ -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
@@ -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
diff --git 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.",

diff --git 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
@@ -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
@@ -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',
     },
 };