Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Re-fetch actions when we move from offline to online in Payments Page #8817

Merged
merged 5 commits into from
May 18, 2022
Merged

Re-fetch actions when we move from offline to online in Payments Page #8817

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6a8d056
refetch actions for Payments Page with an HOC
Apr 28, 2022
c773bc8
remove HOC and applied updates
Apr 28, 2022
202b62e
remove useless use statement
Apr 28, 2022
5477628
update refetch data condition
May 4, 2022
abefcba
remove method binding
May 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import * as Expensicons from '../../../../components/Icon/Expensicons';
import ConfirmModal from '../../../../components/ConfirmModal';
import KYCWall from '../../../../components/KYCWall';
import {propTypes, defaultProps} from './paymentsPagePropTypes';
import {withNetwork} from '../../../../components/OnyxProvider';

class BasePaymentsPage extends React.Component {
constructor(props) {
Expand Down Expand Up @@ -57,15 +58,24 @@ class BasePaymentsPage extends React.Component {
this.hidePasswordPrompt = this.hidePasswordPrompt.bind(this);
this.navigateToTransferBalancePage = this.navigateToTransferBalancePage.bind(this);
this.setMenuPosition = this.setMenuPosition.bind(this);
this.fetchData = this.fetchData.bind(this);
Justicea83 marked this conversation as resolved.
Show resolved Hide resolved
}

componentDidMount() {
PaymentMethods.getPaymentMethods();
this.fetchData();
if (this.props.shouldListenForResize) {
this.dimensionsSubscription = Dimensions.addEventListener('change', this.setMenuPosition);
}
}

componentDidUpdate(prevProps) {
if (prevProps.network.isOffline === this.props.network.isOffline) {
return;
}
Justicea83 marked this conversation as resolved.
Show resolved Hide resolved

this.fetchData();
}

componentWillUnmount() {
if (!this.props.shouldListenForResize || !this.dimensionsSubscription) {
return;
Expand Down Expand Up @@ -186,6 +196,10 @@ class BasePaymentsPage extends React.Component {
throw new Error('Invalid payment method type selected');
}

fetchData() {
PaymentMethods.getPaymentMethods();
Justicea83 marked this conversation as resolved.
Show resolved Hide resolved
}

/**
* Hide the add payment modal
*/
Expand Down Expand Up @@ -432,6 +446,7 @@ BasePaymentsPage.defaultProps = defaultProps;
export default compose(
withWindowDimensions,
withLocalize,
withNetwork(),
withOnyx({
betas: {
key: ONYXKEYS.BETAS,
Expand Down
4 changes: 4 additions & 0 deletions src/pages/settings/Payments/PaymentsPage/paymentsPagePropTypes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import PropTypes from 'prop-types';
import walletTransferPropTypes from '../walletTransferPropTypes';
import {withLocalizePropTypes} from '../../../../components/withLocalize';
import {windowDimensionsPropTypes} from '../../../../components/withWindowDimensions';
import networkPropTypes from '../../../../components/networkPropTypes';

const propTypes = {
/** Wallet balance transfer props */
Expand All @@ -22,6 +23,9 @@ const propTypes = {
currentBalance: PropTypes.number,
}),

/** Information about the network */
network: networkPropTypes.isRequired,

...withLocalizePropTypes,

...windowDimensionsPropTypes,
Expand Down