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

User Email/Telegram Integration #1987

Merged
merged 40 commits into from
Dec 21, 2024

Conversation

corlard3y
Copy link
Collaborator

Pull Request Template

#1964

Description

  • Add User Profile Form to User Settings

  • Add Email/Telegram Integration to User Settings, Dashboard and Rewards Points

  • Claim Activities in Rewards Points after connecting Email/ Telegram

  • 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 corlard3y linked an issue Dec 6, 2024 that may be closed by this pull request
Copy link

github-actions bot commented Dec 6, 2024

All looks good.

Copy link

github-actions bot commented Dec 6, 2024

PR Preview Action v1.4.7
Preview removed because the pull request was closed.
2024-12-21 16:33 UTC

Copy link

github-actions bot commented Dec 6, 2024

All looks good.

Copy link

github-actions bot commented Dec 9, 2024

All looks good.

Copy link

All looks good.

src/components/UserProfileSettings/AddEmail.tsx Outdated Show resolved Hide resolved
src/components/UserProfileSettings/AddEmail.tsx Outdated Show resolved Hide resolved
src/components/UserProfileSettings/AddEmail.tsx Outdated Show resolved Hide resolved
src/components/userSettings/UserSettings.tsx Show resolved Hide resolved
src/components/userSettings/UserSettings.tsx Show resolved Hide resolved
src/components/UserProfileSettings/AddTelegram.tsx Outdated Show resolved Hide resolved
src/modules/dashboard/Dashboard.tsx Outdated Show resolved Hide resolved
Copy link

All looks good.

Copy link

All looks good.

Copy link

All looks good.

@rohitmalhotra1420 rohitmalhotra1420 merged commit b54769c into main Dec 21, 2024
2 checks passed
corlard3y added a commit that referenced this pull request Jan 7, 2025
* 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]>
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.

👾 [Other] - <User Profile/Email API Integration>
5 participants