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

Monetization Feature(Payment Section) #2012

Open
wants to merge 47 commits into
base: main
Choose a base branch
from

Conversation

corlard3y
Copy link
Collaborator

Pull Request Template

#1965

Description

  • Add Monetization Payment Plan section

  • Problem/Feature:

Type of Change

  • Bug fix
  • New feature
  • Code refactor
  • Documentation update
  • Other (please describe):

Checklist

  • Quick PR: Is this a quick PR? Can be approved before finishing a coffee.
    • Quick PR label added
  • Not Merge Ready: Is this PR dependent on some other PR/tasks and not ready to be merged right now.
    • DO NOT Merge PR label added

Frontend Guidelines

Build & Testing

  • No errors in the build terminal
  • Engineer has tested the changes on their local environment
  • Engineer has tested the changes on deploy preview

Screenshots/Video with Explanation

  • Before: Explain the previous behavior

  • After: What's changed now

Additional Context

Review & Approvals

  • Self-review completed
  • Code review by at least one other engineer
  • Documentation updates if applicable

Notes

corlard3y and others added 25 commits November 18, 2024 10:33
* 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
* 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
@corlard3y corlard3y linked an issue Feb 7, 2025 that may be closed by this pull request
@corlard3y corlard3y changed the title 1965 new feature monetization payment Monetization Feature(Payment Section) Feb 7, 2025
Copy link

github-actions bot commented Feb 7, 2025

There are a few issues in the code snippets provided:

  1. In src/App.tsx:
  • There is a missing closing bracket } after the definition for the 'warning' variant in the alertVariants object.
  • The Info and Basic variants are not closed properly with a closing bracket in the alertVariants object.
  1. In src/blocks/icons/components/Meteor.tsx:
  • There seems to be some incomplete path elements like d="M10.5 11L13.5 8" without enclosing <path> tags.

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.

Copy link

github-actions bot commented Feb 7, 2025

In Alert.utils.ts:

  • There are missing closing brackets for the 'warning' and 'info' objects.
  • The 'basic' and 'error' objects are not closed properly with a closing bracket.
  • The structure of the objects for different alert variants should be fixed to have proper closing brackets for each object.
  • The property 'ctaColor' is missing for the 'basic' object in the 'alertVariants' object.

In Meteor.tsx:

  • The SVG path elements are not properly closed with </>
  • Some lines are missing complete path elements.

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.

Copy link

All looks good.

Copy link

All looks good.

Copy link

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.

Copy link

All looks good.

Copy link

All looks good.

Copy link

In the file src/blocks/alert/Alert.utils.ts, there are some issues:

  1. Missing closing curly braces for the 'warning' and 'error' objects.
  2. 'info' and 'basic' objects are missing opening curly braces.
  3. Missing closing curly braces for the 'info' and 'basic' objects.
  4. The 'info' and 'basic' objects should be at the same level as 'success' and 'warning', not nested within them.

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.

Copy link

All looks good.

Copy link

All looks good.

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.

🚀 [New Feature] - <Monetization Feature(Payment Section)>
4 participants