Skip to content

Fix: Add payment method blink after interacting with buttons #12824

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

Merged
marcochavezf merged 2 commits into from
Nov 21, 2022
Merged

Fix: Add payment method blink after interacting with buttons #12824

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f9ad6a
Fix: Add payment method blink after interacting with buttons
hungvu193 Nov 16, 2022
22d5dcd
Add InteractionManager to handle modal content
hungvu193 Nov 18, 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
124 changes: 71 additions & 53 deletions src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import withWindowDimensions from '../../../../components/withWindowDimensions';
import CurrentWalletBalance from '../../../../components/CurrentWalletBalance';
import ONYXKEYS from '../../../../ONYXKEYS';
import Permissions from '../../../../libs/Permissions';
import ConfirmPopover from '../../../../components/ConfirmPopover';
import AddPaymentMethodMenu from '../../../../components/AddPaymentMethodMenu';
import CONST from '../../../../CONST';
import * as Expensicons from '../../../../components/Icon/Expensicons';
Expand All @@ -32,6 +31,7 @@ import {propTypes, defaultProps} from './paymentsPagePropTypes';
import {withNetwork} from '../../../../components/OnyxProvider';
import * as PaymentUtils from '../../../../libs/PaymentUtils';
import OfflineWithFeedback from '../../../../components/OfflineWithFeedback';
import ConfirmContent from '../../../../components/ConfirmContent';

class BasePaymentsPage extends React.Component {
constructor(props) {
Expand All @@ -41,7 +41,6 @@ class BasePaymentsPage extends React.Component {
shouldShowAddPaymentMenu: false,
shouldShowDefaultDeleteMenu: false,
shouldShowPasswordPrompt: false,
shouldShowConfirmPopover: false,
isSelectedPaymentMethodDefault: false,
selectedPaymentMethod: {},
formattedSelectedPaymentMethod: {
Expand All @@ -52,6 +51,7 @@ class BasePaymentsPage extends React.Component {
anchorPositionRight: 0,
addPaymentMethodButton: null,
methodID: null,
showConfirmDeleteContent: false,
};

this.paymentMethodPressed = this.paymentMethodPressed.bind(this);
Expand Down Expand Up @@ -215,6 +215,11 @@ class BasePaymentsPage extends React.Component {
*/
hideDefaultDeleteMenu() {
this.setState({shouldShowDefaultDeleteMenu: false});
InteractionManager.runAfterInteractions(() => {
this.setState({
showConfirmDeleteContent: false,
});
});
}

hidePasswordPrompt() {
Expand Down Expand Up @@ -319,10 +324,10 @@ class BasePaymentsPage extends React.Component {
onPress={this.paymentMethodPressed}
style={[styles.flex4]}
isAddPaymentMenuActive={this.state.shouldShowAddPaymentMenu}
actionPaymentMethodType={this.state.shouldShowDefaultDeleteMenu || this.state.shouldShowPasswordPrompt || this.state.shouldShowConfirmPopover
actionPaymentMethodType={this.state.shouldShowDefaultDeleteMenu || this.state.shouldShowPasswordPrompt
? this.state.selectedPaymentMethodType
: ''}
activePaymentMethodID={this.state.shouldShowDefaultDeleteMenu || this.state.shouldShowPasswordPrompt || this.state.shouldShowConfirmPopover
activePaymentMethodID={this.state.shouldShowDefaultDeleteMenu || this.state.shouldShowPasswordPrompt
? this.getSelectedPaymentMethodID()
: ''}
/>
Expand All @@ -345,13 +350,14 @@ class BasePaymentsPage extends React.Component {
right: this.state.anchorPositionRight,
}}
>
<View
style={[
styles.m5,
!this.props.isSmallScreenWidth ? styles.sidebarPopover : '',
]}
>
{isPopoverBottomMount && (
{!this.state.showConfirmDeleteContent ? (
<View
style={[
styles.m5,
!this.props.isSmallScreenWidth ? styles.sidebarPopover : '',
]}
>
{isPopoverBottomMount && (
<MenuItem
title={this.state.formattedSelectedPaymentMethod.title || ''}
icon={this.state.formattedSelectedPaymentMethod.icon}
Expand All @@ -360,8 +366,8 @@ class BasePaymentsPage extends React.Component {
disabled
interactive={false}
/>
)}
{shouldShowMakeDefaultButton && (
)}
{shouldShowMakeDefaultButton && (
<TouchableOpacity
onPress={() => {
this.setState({
Expand All @@ -384,31 +390,66 @@ class BasePaymentsPage extends React.Component {
{this.props.translate('paymentsPage.setDefaultConfirmation')}
</Text>
</TouchableOpacity>
)}
<TouchableOpacity
onPress={() => {
)}
<TouchableOpacity
onPress={() => {
this.setState({
showConfirmDeleteContent: true,
});
}}
style={[
styles.button,
styles.buttonDanger,
shouldShowMakeDefaultButton && styles.mt4,
styles.alignSelfCenter,
styles.w100,
]}
>
<Text style={[styles.buttonText, styles.textWhite]}>
{this.props.translate('common.delete')}
</Text>
</TouchableOpacity>
</View>
) : (
<ConfirmContent
onConfirm={() => {
this.setState({
shouldShowDefaultDeleteMenu: false,
});
InteractionManager.runAfterInteractions(() => {
this.setState({
shouldShowConfirmPopover: true,
showConfirmDeleteContent: false,
});
});
this.deletePaymentMethod();
}}
style={[
styles.button,
styles.buttonDanger,
shouldShowMakeDefaultButton && styles.mt4,
styles.alignSelfCenter,
styles.w100,
]}
>
<Text style={[styles.buttonText, styles.textWhite]}>
{this.props.translate('common.delete')}
</Text>
</TouchableOpacity>
</View>
onCancel={() => {
this.setState({
shouldShowDefaultDeleteMenu: false,
});
InteractionManager.runAfterInteractions(
() => {
this.setState(
{
showConfirmDeleteContent: false,
},
);
},
);
}}
contentStyles={!this.props.isSmallScreenWidth ? [styles.sidebarPopover] : undefined}
title={this.props.translate('paymentsPage.deleteAccount')}
prompt={this.props.translate('paymentsPage.deleteConfirmation')}
confirmText={this.props.translate('common.delete')}
cancelText={this.props.translate('common.cancel')}
anchorPosition={{
top: this.state.anchorPositionTop,
right: this.state.anchorPositionRight,
}}
shouldShowCancelButton
danger
/>
)}
</Popover>
<PasswordPopover
isVisible={this.state.shouldShowPasswordPrompt}
Expand All @@ -424,29 +465,6 @@ class BasePaymentsPage extends React.Component {
submitButtonText={this.state.passwordButtonText}
isDangerousAction
/>
<ConfirmPopover
contentStyles={!this.props.isSmallScreenWidth ? [styles.sidebarPopover] : undefined}
isVisible={this.state.shouldShowConfirmPopover}
title={this.props.translate('paymentsPage.deleteAccount')}
prompt={this.props.translate('paymentsPage.deleteConfirmation')}
confirmText={this.props.translate('common.delete')}
cancelText={this.props.translate('common.cancel')}
anchorPosition={{
top: this.state.anchorPositionTop,
right: this.state.anchorPositionRight,
}}
onConfirm={() => {
this.setState({
shouldShowConfirmPopover: false,
});
this.deletePaymentMethod();
}}
onCancel={() => {
this.setState({shouldShowConfirmPopover: false});
}}
shouldShowCancelButton
danger
/>
</ScreenWrapper>
);
}
Expand Down