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.

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

Jon/desktop-modal-x #232

Merged
merged 4 commits into from
Feb 28, 2025
Merged

Jon/desktop-modal-x #232

merged 4 commits into from
Feb 28, 2025

Conversation

Jon-edge
Copy link
Contributor

@Jon-edge Jon-edge commented Feb 26, 2025

Minor difference: use context from GUI to determine isDesktop instead of the native dependency

Spun off some other component sync tasks to https://app.asana.com/0/1200972350208303/1209521068045186

CHANGELOG

Does this branch warrant an entry to the CHANGELOG?

  • Yes
  • No

Dependencies

none

Description

none

@Jon-edge Jon-edge force-pushed the jon/desktop-modal-x branch from aba28c0 to e32fb97 Compare February 27, 2025 19:21
@Jon-edge Jon-edge force-pushed the jon/desktop-modal-x branch from e32fb97 to 53796ad Compare February 27, 2025 21:54
@@ -49,6 +50,8 @@ export async function retryOnChallenge<T, C>(opts: {

export const ChallengeModal = (props: Props) => {
const { bridge, challengeUri } = props
const { context } = useImports()
const { isDesktop } = context
Copy link
Contributor

Choose a reason for hiding this comment

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

This commit is using something that's not defined yet. Can we move it later in the PR (or just drop it as per the other comment)?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Dropped the commit

Comment on lines 90 to 101
{!isDesktop ? null : (
<EdgeTouchableOpacity
style={styles.closeIconContainer}
onPress={handleCancel}
>
<AntDesignIcon
name="close"
color={theme.primaryText}
size={theme.rem(1.25)}
/>
</EdgeTouchableOpacity>
)}
Copy link
Contributor

Choose a reason for hiding this comment

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

It looks like the goal is to only show the close button on desktop? However, I think we need a close button on mobile too, since there is no other way to escape. The challenge HTML eats the scroll gesture, so swipe-to-close doesn't work, and there's no other exit button. Maybe we can just drop the commit.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Dropped the commit

Minor difference: use `context` from GUI to determine `isDesktop` instead of the native dependency
@Jon-edge Jon-edge force-pushed the jon/desktop-modal-x branch from 53796ad to 42e12ac Compare February 28, 2025 18:46
@Jon-edge
Copy link
Contributor Author

I've updated the task with th expectations for ChallengeModal

@Jon-edge Jon-edge merged commit 228aca5 into master Feb 28, 2025
1 check passed
@Jon-edge Jon-edge deleted the jon/desktop-modal-x branch February 28, 2025 18:57
@Jon-edge Jon-edge restored the jon/desktop-modal-x branch February 28, 2025 20:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants