fix: gift subscription feedback #4160

sshanzel · 2025-02-06T14:35:17Z

Changes

App crashes on certain pages (due to some context not available on render).
Spacings on the Gifting option UI.
Fixed the profile UI for preselected user on the modal and when selecting a new one.

Preview:

Events

Did you introduce any new tracking events?

Experiment

Did you introduce any new experiments?

Manual Testing

Caution

Please make sure existing components are not breaking/affected by this PR

Preview domain

https://fix-gift-feedback.preview.app.daily.dev

vercel · 2025-02-06T14:35:22Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Updated (UTC)
daily-webapp	✅ Ready (Inspect)	Visit Preview	Feb 7, 2025 3:13pm

1 Skipped Deployment

Name	Status	Preview	Updated (UTC)
storybook	⬜️ Ignored (Inspect)		Feb 7, 2025 3:13pm

sshanzel · 2025-02-06T14:38:03Z

packages/shared/src/components/ConditionalWrapper.tsx

+export const ConditionalRender = ({
+  condition,
+  children,
+}: Pick<ConditionalWrapperProps, 'condition' | 'children'>): ReactNode => {
+  if (!condition) {
+    return null;
+  }
+
+  return children;
+};


I wanted to avoid the ugly ternary ladder, which adds indent and confusing conditions.

For example:

{!preselected ? (selected ? ( <Component1 /> ) : ( <Component2 /> ) ) : null }

Instead, we can just do something similar to our ConditionalWrapper by doing:

<ConditionalRender condition={isTrue}> { selected ? ( <Component1 /> ) : ( <Component2 /> ) } </ConditionalRender>

This will keep the ternaries to a single level.

It doesn't really though right, it's just masking it.
Technically still read it as if...else inside if...else

Not against it, but not sure it's that much clearer.
@capJavert // @omBratteng what you guys think?

I'm happy to keep it though to unblock you.

Personally, I just hate excessive indents and multiple ternaries at once, especially when combined together, as it would require you to focus deeply just to understand the simple if-else-if conditions. Also a simple misplacement of the parenthesis, the result would be totally different. Hence hard to follow.

Probably more of a cosmetic than functional change for readability.

Ah agreed I'd love to avoid the nested ternaries in the first place.
But to me this is just a wrapper the result is still having the ternary.

One other solution is to render 2 functions and do the inside ternary inside 1 function?

Yeah, that can work too, by doing early returns. I'll be merging this now but I'll update and raise another PR once we get more answers on what could fit our current setup.

ilasw

Looks good code wise ✅

rebelchris

One non blocking comment.

rebelchris · 2025-02-07T14:19:05Z

packages/shared/src/components/ConditionalWrapper.tsx

+export const ConditionalRender = ({
+  condition,
+  children,
+}: Pick<ConditionalWrapperProps, 'condition' | 'children'>): ReactNode => {
+  if (!condition) {
+    return null;
+  }
+
+  return children;
+};


It doesn't really though right, it's just masking it.
Technically still read it as if...else inside if...else

Not against it, but not sure it's that much clearer.
@capJavert // @omBratteng what you guys think?

I'm happy to keep it though to unblock you.

rebelchris · 2025-02-07T14:21:14Z

packages/shared/src/components/comments/CommentActionButtons.tsx

@@ -89,7 +88,7 @@ export default function CommentActionButtons({
  const { onMenuClick, isOpen, onHide } = useContextMenu({ id });
  const { openModal } = useLazyModal();
  const { displayToast } = useToastNotification();
-  const { isPlusAvailable } = usePaymentContext();
+  const { isValidRegion: isPlusAvailable } = useAuthContext();


Oh I see we actually already just re-export it lol.
Yeah this is better.

* feat: gift user modal (#4091) * feat: add gift option to profile menu (#4085) * feat: Add gift option to profile menu * feat: gift user modal * add the modal * feat: search user with mention * tmp: show modal * fix: on change handler * fix: debounce * fix: keyboard navigation * fix: arrow and on focus * feat: on hover, set selected * fix: ref * fix: index * fix: overlay append * fix: interactivity * fix: on close * fix: selected ui * fix: gap * fix: alignment * fix: roundness * fix: TODO * fix: checking disabled * Revert "tmp: show modal" This reverts commit 3f53473. * fix: missing context provider * fix: modal pricing * fix: missing preselected user --------- Co-authored-by: Lee Hansel Solevilla <sshanzel@yahoo.com> Co-authored-by: Lee Hansel Solevilla <13744167+sshanzel@users.noreply.github.com> * feat: gift plus in invite friends section (#4097) * feat: Add gift option to profile menu * feat: gift user modal * add the modal * feat: search user with mention * tmp: show modal * fix: on change handler * fix: debounce * fix: keyboard navigation * fix: arrow and on focus * feat: on hover, set selected * fix: ref * fix: index * fix: overlay append * fix: interactivity * fix: on close * fix: selected ui * fix: gap * fix: alignment * fix: roundness * fix: TODO * fix: checking disabled * Revert "tmp: show modal" This reverts commit 3f53473. * fix: missing context provider * fix: modal pricing * fix: missing preselected user * feat: gift plus in invite friends section --------- Co-authored-by: Lee Hansel Solevilla <sshanzel@yahoo.com> Co-authored-by: Lee Hansel Solevilla <13744167+sshanzel@users.noreply.github.com> * feat: add gift button to dropdowns (#4092) * feat: Add gift option to profile menu * feat: gift user modal * add the modal * feat: Add gift butto to dropdowns * feat: search user with mention * tmp: show modal * fix: on change handler * fix: debounce * fix: keyboard navigation * fix: arrow and on focus * feat: on hover, set selected * fix: ref * fix: index * fix: overlay append * fix: interactivity * fix: on close * fix: selected ui * fix: gap * fix: alignment * fix: roundness * fix: TODO * fix: checking disabled * Revert "tmp: show modal" This reverts commit 3f53473. * fix: missing context provider * fix: modal pricing * fix: missing preselected user * chore: update blocker --------- Co-authored-by: Lee Hansel Solevilla <sshanzel@yahoo.com> Co-authored-by: Lee Hansel Solevilla <13744167+sshanzel@users.noreply.github.com> * refactor: plus page to allow gifting another user (#4108) * fix: usage of apps id from paddle (#4123) * fix: gifting while user is a Plus member already (#4131) * feat: notification modal opening logic (#4132) * feat: gift tracking (#4135) * feat: add missing gifter_id param in checkout (#4137) * fix: merge issues * fix: missing gifter id * fix: is disabled * refactor: unnecessary const * revert: privacy to all * fix: gift subscription feedback (#4160) * fix: displayed ui when gifted (#4169) * fix: typo --------- Co-authored-by: Lee Hansel Solevilla <13744167+sshanzel@users.noreply.github.com> Co-authored-by: Amar Trebinjac <36768584+AmarTrebinjac@users.noreply.github.com> Co-authored-by: Lee Hansel Solevilla <sshanzel@yahoo.com>

sshanzel added 5 commits February 6, 2025 21:02

fix: gift modal UI

4370ce9

fix: app crash

1eb138a

fix: spacing

1da1ee9

fix: minor

317f89c

fix: error

fe57b27

sshanzel requested a review from a team as a code owner February 6, 2025 14:35

sshanzel requested review from rebelchris, omBratteng, ilasw, capJavert, nensidosari and AmarTrebinjac February 6, 2025 14:35

fix: urls

73709a8

vercel bot deployed to Preview – daily-webapp February 6, 2025 14:37 View deployment

sshanzel commented Feb 6, 2025

View reviewed changes

fix: keyboard nav without data

3971a34

vercel bot deployed to Preview – daily-webapp February 7, 2025 09:51 View deployment

Merge branch 'MI-746-gifting-plus' into fix-gift-feedback

5a6d438

vercel bot deployed to Preview – daily-webapp February 7, 2025 10:19 View deployment

ilasw approved these changes Feb 7, 2025

View reviewed changes

rebelchris approved these changes Feb 7, 2025

View reviewed changes

Merge branch 'MI-746-gifting-plus' into fix-gift-feedback

09ef44b

vercel bot deployed to Preview – daily-webapp February 7, 2025 15:13 View deployment

sshanzel merged commit 2ccdc43 into MI-746-gifting-plus Feb 7, 2025
10 checks passed

sshanzel deleted the fix-gift-feedback branch February 7, 2025 15:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: gift subscription feedback #4160

fix: gift subscription feedback #4160

sshanzel commented Feb 6, 2025 •

edited

Loading

vercel bot commented Feb 6, 2025 •

edited

Loading

sshanzel Feb 6, 2025 •

edited

Loading

rebelchris Feb 7, 2025

sshanzel Feb 7, 2025 •

edited

Loading

sshanzel Feb 7, 2025

rebelchris Feb 7, 2025

sshanzel Feb 7, 2025

ilasw left a comment

rebelchris left a comment

rebelchris Feb 7, 2025

rebelchris Feb 7, 2025

fix: gift subscription feedback #4160

fix: gift subscription feedback #4160

Conversation

sshanzel commented Feb 6, 2025 • edited Loading

Changes

Events

Experiment

Manual Testing

Preview domain

vercel bot commented Feb 6, 2025 • edited Loading

sshanzel Feb 6, 2025 • edited Loading

Choose a reason for hiding this comment

rebelchris Feb 7, 2025

Choose a reason for hiding this comment

sshanzel Feb 7, 2025 • edited Loading

Choose a reason for hiding this comment

sshanzel Feb 7, 2025

Choose a reason for hiding this comment

rebelchris Feb 7, 2025

Choose a reason for hiding this comment

sshanzel Feb 7, 2025

Choose a reason for hiding this comment

ilasw left a comment

Choose a reason for hiding this comment

rebelchris left a comment

Choose a reason for hiding this comment

rebelchris Feb 7, 2025

Choose a reason for hiding this comment

rebelchris Feb 7, 2025

Choose a reason for hiding this comment

sshanzel commented Feb 6, 2025 •

edited

Loading

vercel bot commented Feb 6, 2025 •

edited

Loading

sshanzel Feb 6, 2025 •

edited

Loading

sshanzel Feb 7, 2025 •

edited

Loading