-
Notifications
You must be signed in to change notification settings - Fork 45
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
Monetization Feature(Payment Section) #2012
base: main
Are you sure you want to change the base?
Conversation
* DAPP-1966: Pricing plan UI integration WIP * DAPP-1966: Integrate Pricing Page UI - Finalizing Tabs Background and Spacing Variables - Completed the integration of the Pricing Page UI. - Tabs background and spacing variables are still under review; awaiting final decisions from the design team. * DAPP-1966: Integrate pricing UI - Updated tab background color & button semantics for active tab - Updated get started button background style - Added padding at the bottom of the benefit list in the Pricing Plan Box * DAPP-1966: Integrate Purchase Plan UI - Integrated UI for the Purchase Plan feature. * DAPP-1966: Integrate Purchase Plan Modal UI - Integrated UI for the purchase plan modals. - Adjusted spacing and layout on the pricing page for consistency. * DAPP-1966: Integrate Purchase Plan Alerts UI - Created a common alert component to display various types of alerts with dynamic content - Moved FAQ component to common components for reuse across multiple pages - Updated FAQ answer content and UI * DAPP-1966: PR review changes - Added illustrations for Push logo with name - Implemented conditional leading icon in approve button - Extracted FAQ container and list into separate components - Created a common file for FAQ answer components - Refactored code for improved readability and maintainability * DAPP-1966: Keep componentName props value as actual component name in illustration and removed unused imports
…on-ui 1971 other user settings on UI
* DAPP-1967-bonus-activity-container-position-fix * DAPP-1967 added lozenge tags support in staking activities
* update reset logic * update yarn.lock
* Fixed the flow for Snaps in user settings page * DAPP-1959 logo alignment fix --------- Co-authored-by: rohitmalhotra1420 <[email protected]>
* update reset fn * update stake code
* update interface user account * update email and verify modal * DAPP-1957: Integrate UI for Dashboard Social Account Links (Email/Telegram/Discord) * update formdata * update button size * update icons * update user profile info * update user profile * update verify email * add telegram and discord modals * update dashboard to work with modals * update modals * update telegram flow * fix: added changes for telegram user validation * update url * update value and type * add discord verification * update dropdown * add social handles to rewards points * add rewards handle list item * update rewards email telegram * update index * update telegram and discord * add usersocial profile hook * adjust prod url * add baseurl and form error message * add enabled filter * remove console logs * hide discord on dev * remove discord * fix email schema * fix telegram schema * resolve comments * fix tooltip bug * fix url and add form settings * Fixed the display of alert message for email and telegram * telegram congif fixes for staging, localhost and alpha env --------- Co-authored-by: Kushdeep Singh <[email protected]> Co-authored-by: Ashis <[email protected]> Co-authored-by: abhishek-01k <[email protected]> Co-authored-by: rohitmalhotra1420 <[email protected]>
* fix rewards toast notification not closing * remove console
* add claim option in activity * add button * add telegram third step
There are a few issues in the code snippets provided:
Other than the above mentioned issues, the code looks good. Please address the identified issues and re-check the code. If there are any other issues or if you need further assistance, feel free to ask. |
In Alert.utils.ts:
In Meteor.tsx:
The component files PushLogo.tsx, PushLogoWithNameDark.tsx, PushLogoWithNameLight.tsx in illustrations/components are empty. They should contain valid component code. Review the other files as well for any logic or syntax errors. All looks good. |
All looks good. |
All looks good. |
In Alert.utils.ts file, there are some mistakes in defining the alert variants object. The "info" and "basic" variants are missing closing curly braces and commas after each variant object. Here's the corrected version: export const alertVariants: Record<
AlertVariant,
{ icon: FC<IconProps>; iconColor: ThemeColors; borderColor: ThemeColors; bgColor: ThemeColors; ctaColor: ThemeColors }
> = {
success: {
icon: TickCircleFilled,
iconColor: 'components-alert-icon-success',
borderColor: 'components-alert-stroke-success',
bgColor: 'components-alert-background-success',
ctaColor: 'components-alert-text-cta-success',
},
warning: {
icon: WarningCircleFilled,
iconColor: 'components-alert-icon-warning',
borderColor: 'components-alert-stroke-warning',
bgColor: 'components-alert-background-warning',
ctaColor: 'components-alert-text-cta-warning',
},
info: {
icon: InfoFilled,
iconColor: 'components-alert-icon-info',
borderColor: 'components-alert-stroke-info',
bgColor: 'components-alert-background-info',
ctaColor: 'components-alert-text-cta-info',
},
basic: {
iconColor: 'components-alert-icon-basic',
borderColor: 'components-alert-stroke-basic',
bgColor: 'components-alert-background-basic',
ctaColor: 'components-alert-text-cta-basic',
},
error: {
iconColor: 'components-alert-icon-error',
borderColor: 'components-alert-stroke-error',
bgColor: 'components-alert-background-error',
ctaColor: 'components-alert-text-cta-error',
},
}; Please check the code and confirm if this correction is accurate. |
All looks good. |
All looks good. |
In the file src/blocks/alert/Alert.utils.ts, there are some issues:
Here is the corrected version: export const alertVariants: Record<
AlertVariant,
{ icon: FC<IconProps>; iconColor: ThemeColors; borderColor: ThemeColors; bgColor: ThemeColors; ctaColor: ThemeColors }
> = {
success: {
icon: TickCircleFilled,
iconColor: 'components-alert-icon-success',
borderColor: 'components-alert-stroke-success',
bgColor: 'components-alert-background-success',
ctaColor: 'components-alert-text-cta-success',
},
warning: {
icon: WarningCircleFilled,
iconColor: 'components-alert-icon-warning',
borderColor: 'components-alert-stroke-warning',
bgColor: 'components-alert-background-warning',
ctaColor: 'components-alert-text-cta-warning',
},
info: {
icon: InfoFilled,
iconColor: 'components-alert-icon-info',
borderColor: 'components-alert-stroke-info',
bgColor: 'components-alert-background-info',
ctaColor: 'components-alert-text-cta-info',
},
basic: {
iconColor: 'components-alert-icon-basic',
borderColor: 'components-alert-stroke-basic',
bgColor: 'components-alert-background-basic',
ctaColor: 'components-alert-text-cta-basic',
},
error: {
iconColor: 'components-alert-icon-error',
borderColor: 'components-alert-stroke-error',
bgColor: 'components-alert-background-error',
ctaColor: 'components-alert-text-cta-error',
},
}; All the other files are not under scrutiny as per the request. |
All looks good. |
All looks good. |
Pull Request Template
#1965
Description
Add Monetization Payment Plan section
Problem/Feature:
Type of Change
Checklist
Frontend Guidelines
Build & Testing
Screenshots/Video with Explanation
Before: Explain the previous behavior
After: What's changed now
Additional Context
Review & Approvals
Notes