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

Enable ending animation in RequireTwoFactorAuthenticationModal #50790

Merged
merged 3 commits into from
Oct 22, 2024
Merged

Enable ending animation in RequireTwoFactorAuthenticationModal #50790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b407136
Enable animation out
zfurtak Oct 15, 2024
bca11fb
Changed animationOutTiming
zfurtak Oct 15, 2024
194adfa
Adjusted to review
zfurtak Oct 18, 2024
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
4 changes: 2 additions & 2 deletions src/components/ConnectToXeroFlow/index.native.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ function ConnectToXeroFlow({policyID}: ConnectToXeroFlowProps) {

return (
<>
{isRequire2FAModalOpen && (
zfurtak marked this conversation as resolved.
Show resolved Hide resolved
{!is2FAEnabled && (
<RequireTwoFactorAuthenticationModal
onSubmit={() => {
setIsRequire2FAModalOpen(false);
Navigation.navigate(ROUTES.SETTINGS_2FA.getRoute(ROUTES.POLICY_ACCOUNTING.getRoute(policyID), getXeroSetupLink(policyID)));
}}
onCancel={() => setIsRequire2FAModalOpen(false)}
isVisible
isVisible={isRequire2FAModalOpen}
description={translate('twoFactorAuth.twoFactorAuthIsRequiredDescription')}
/>
)}
Expand Down
4 changes: 2 additions & 2 deletions src/components/ConnectToXeroFlow/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function ConnectToXeroFlow({policyID}: ConnectToXeroFlowProps) {
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);

if (isRequire2FAModalOpen) {
if (!is2FAEnabled) {
return (
<RequireTwoFactorAuthenticationModal
onSubmit={() => {
Expand All @@ -39,7 +39,7 @@ function ConnectToXeroFlow({policyID}: ConnectToXeroFlowProps) {
onCancel={() => {
setIsRequire2FAModalOpen(false);
}}
isVisible
isVisible={isRequire2FAModalOpen}
description={translate('twoFactorAuth.twoFactorAuthIsRequiredDescription')}
/>
);
Expand Down
1 change: 1 addition & 0 deletions src/components/RequireTwoFactorAuthenticationModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ function RequireTwoFactorAuthenticationModal({onCancel = () => {}, description,
type={shouldUseNarrowLayout ? CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED : CONST.MODAL.MODAL_TYPE.CONFIRM}
innerContainerStyle={{...styles.pb5, ...styles.pt3, ...styles.boxShadowNone}}
shouldEnableNewFocusManagement={shouldEnableNewFocusManagement}
animationOutTiming={500}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

500 is new value, specific to this modal. If this looks much smoother than before, should this be applied to all modals for consistency?
I think we can leave as is for now so suggest to remove this line

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general, we're now improving user experience related to modal in this issue. This is just a part of bigger change 😊
Here in this PR I was just fixing a small bug that I spotted, while analysing all modals in the app. But I thought it would better look with the longer slide out animation, that's why I asked the design team 📞
Soon all modals will be more consistent in case of animations.

>
<View style={safeAreaPaddingBottomStyle}>
<View
Expand Down
Loading