Skip to content

Commit

Permalink
Merge pull request #12690 from Expensify/OSBotify-cherry-pick-staging…
Browse files Browse the repository at this point in the history
…-12688

🍒 Cherry pick PR #12688 to staging 🍒
  • Loading branch information
OSBotify authored Nov 11, 2022
2 parents acc63a0 + e6fa6ae commit 3bf0b72
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 35 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1001022701
versionName "1.2.27-1"
versionCode 1001022703
versionName "1.2.27-3"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()

if (isNewArchitectureEnabled()) {
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensify/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.2.27.1</string>
<string>1.2.27.3</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensifyTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.2.27.1</string>
<string>1.2.27.3</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
"version": "1.2.27-1",
"version": "1.2.27-3",
"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.",
Expand Down
29 changes: 1 addition & 28 deletions src/pages/home/report/ReportActionsList.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import PropTypes from 'prop-types';
import React from 'react';
import {View, Animated} from 'react-native';
import {Animated} from 'react-native';
import InvertedFlatList from '../../../components/InvertedFlatList';
import withDrawerState, {withDrawerPropTypes} from '../../../components/withDrawerState';
import compose from '../../../libs/compose';
Expand Down Expand Up @@ -67,7 +67,6 @@ class ReportActionsList extends React.Component {
constructor(props) {
super(props);
this.renderItem = this.renderItem.bind(this);
this.renderCell = this.renderCell.bind(this);
this.keyExtractor = this.keyExtractor.bind(this);

this.state = {
Expand Down Expand Up @@ -146,32 +145,6 @@ class ReportActionsList extends React.Component {
);
}

/**
* This function overrides the CellRendererComponent (defaults to a plain View), giving each ReportActionItem a
* higher z-index than the one below it. This prevents issues where the ReportActionContextMenu overlapping between
* rows is hidden beneath other rows.
*
* @param {Object} cellData
* @param {Object} cellData.item - The ReportAction item in the FlatList.
* @param {Number} cellData.index – The index of the item in the FlatList
* @param {Object|Array} cellData.style – The default styles of the CellRendererComponent provided by the CellRenderer.
* @param {Object} props – All the other Props provided to the CellRendererComponent by default.
* @returns {JSX.Element}
*/
renderCell({
item,
index,
style,
...props
}) {
const cellStyle = [
style,
{zIndex: index},
];
// eslint-disable-next-line react/jsx-props-no-spreading
return <View style={cellStyle} {...props} />;
}

render() {
// Native mobile does not render updates flatlist the changes even though component did update called.
// To notify there something changes we can use extraData prop to flatlist
Expand Down

0 comments on commit 3bf0b72

Please sign in to comment.