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

[CP Staging] Subscription plan card UI changes #55117

Merged
merged 7 commits into from
Jan 13, 2025
Merged

[CP Staging] Subscription plan card UI changes #55117

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3492563
fixed showing the collect upgrade policy view for categorizing
jayeshmangwani Jan 11, 2025
1d869ea
removed pressable parent View from Subscription Plans Card
jayeshmangwani Jan 11, 2025
e1a655c
Merge branch 'main' into subscription_plan_card_ui_changes
jayeshmangwani Jan 12, 2025
67f949a
Merge branch 'main' into subscription_plan_card_ui_changes
jayeshmangwani Jan 13, 2025
e1ad3d2
Merge branch 'main' into subscription_plan_card_ui_changes
jayeshmangwani Jan 13, 2025
84bc92c
added a comment for GenericFeaturesView,when to display
jayeshmangwani Jan 13, 2025
c52c520
removed unnecessary empty lines from comment
jayeshmangwani Jan 13, 2025
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
69 changes: 35 additions & 34 deletions src/pages/settings/Subscription/SubscriptionPlan/SubscriptionPlanCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import * as Expensicons from '@components/Icon/Expensicons';
import {PressableWithFeedback} from '@components/Pressable';
import SelectCircle from '@components/SelectCircle';
import Text from '@components/Text';
import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import variables from '@styles/variables';
Expand All @@ -30,45 +31,45 @@ type SubscriptionPlanCardProps = {
function SubscriptionPlanCard({plan, index, onPress}: SubscriptionPlanCardProps) {
const styles = useThemeStyles();
const theme = useTheme();
const {shouldUseNarrowLayout} = useResponsiveLayout();

return (
<View style={[styles.borderedContentCard, styles.flex1, styles.mt5, styles.p5, index === 0 && styles.mr3, plan.isSelected && styles.borderColorFocus]}>
<PressableWithFeedback
accessibilityLabel={plan.title}
wrapperStyle={[styles.flex1]}
onPress={() => onPress(plan.type)}
>
<View style={[styles.flexRow, styles.justifyContentBetween]}>
<PressableWithFeedback
accessibilityLabel={plan.title}
wrapperStyle={[styles.flexShrink1]}
style={[styles.borderedContentCard, styles.mt5, styles.flex1, !shouldUseNarrowLayout && index === 0 && styles.mr3, plan.isSelected && styles.borderColorFocus, styles.p5]}
onPress={() => onPress(plan.type)}
>
<View style={[styles.flexRow, styles.justifyContentBetween]}>
<Icon
src={plan.src}
width={variables.iconHeader}
height={variables.iconHeader}
/>
<View>
<SelectCircle
isChecked={plan.isSelected}
selectCircleStyles={styles.sectionSelectCircle}
/>
</View>
</View>
<Text style={[styles.headerText, styles.mv2]}>{plan.title}</Text>
<Text style={[styles.textLabelSupporting, styles.mb2]}>{plan.description}</Text>
{plan.benefits.map((benefit) => (
<View
style={[styles.flexRow, styles.alignItemsCenter, styles.mt2]}
key={benefit}
>
<Icon
src={plan.src}
width={variables.iconHeader}
height={variables.iconHeader}
src={Expensicons.Checkmark}
fill={theme.iconSuccessFill}
width={variables.iconSizeSmall}
height={variables.iconSizeSmall}
/>
<View>
<SelectCircle
isChecked={plan.isSelected}
selectCircleStyles={styles.sectionSelectCircle}
/>
</View>
<Text style={[styles.textMicroSupporting, styles.ml2]}>{benefit}</Text>
</View>
<Text style={[styles.headerText, styles.mv2]}>{plan.title}</Text>
<Text style={[styles.textLabelSupporting, styles.mb2]}>{plan.description}</Text>
{plan.benefits.map((benefit) => (
<View
style={[styles.flexRow, styles.alignItemsCenter, styles.mt2]}
key={benefit}
>
<Icon
src={Expensicons.Checkmark}
fill={theme.iconSuccessFill}
width={variables.iconSizeSmall}
height={variables.iconSizeSmall}
/>
<Text style={[styles.textMicroSupporting, styles.ml2]}>{benefit}</Text>
</View>
))}
</PressableWithFeedback>
</View>
))}
</PressableWithFeedback>
);
}

Expand Down
11 changes: 10 additions & 1 deletion src/pages/workspace/upgrade/UpgradeIntro.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,16 @@ function UpgradeIntro({feature, onUpgrade, buttonDisabled, loading, isCategorizi
return `${convertToShortDisplayString(upgradePrice, upgradeCurrency)} `;
}, [preferredCurrency, isCategorizing]);

if (!feature || !policyID) {
/**
*
* If the feature is null or there is no policyID, it indicates the user is not associated with any specific workspace.
* In this case, the generic upgrade view should be shown.
* However, the policyID check is only necessary when the user is not coming from the "Categorize" option.
* The "isCategorizing" flag is set to true when the user accesses the "Categorize" option in the Self-DM whisper.
* In such scenarios, a separate Categories upgrade UI is displayed.
*
*/
if (!feature || (!isCategorizing && !policyID)) {
return (
<GenericFeaturesView
onUpgrade={onUpgrade}
Expand Down
Loading