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

Jump to bottom

User Email/Telegram Integration #1987

Merged
merged 40 commits into from
Dec 21, 2024
Merged

User Email/Telegram Integration #1987

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 and others added 29 commits November 7, 2024 14:49
@corlard3y
update interface user account
1f87d17
@corlard3y
update email and verify modal
e6d8208
@meKushdeepSingh
DAPP-1957: Integrate UI for Dashboard Social Account Links (Email/Tel…
376ea48 
…egram/Discord)
@corlard3y
update formdata
b7bf3c7
@corlard3y
update button size
c7887b6
@corlard3y
Merge pull request #1962 from push-protocol/1957-dashboard-monetizati…
96e59e9 
…on-flow

DAPP-1957: Integrate UI for Dashboard Social Account Links (Email/Telegram/Discord)
@corlard3y
Merge pull request #1963 from push-protocol/1958-update-user-account-…
33fcc44 
…link-flow-ui

Update user account link flow UI(user settings)
@corlard3y
update icons
04ab4d6
@corlard3y
update user profile info
34e2430
@corlard3y
update user profile
ca3bc54
@corlard3y
update verify email
2d510fd
@corlard3y
add telegram and discord modals
6a68e09
@corlard3y
update dashboard to work with modals
4c7c17a
@corlard3y
update modals
2638048
@corlard3y
update telegram flow
dac8dd6
@akp111
fix: added changes for telegram user validation
14a6673
@corlard3y
update url
10b312e
@corlard3y
update value and type
6a01bc7
@corlard3y
add discord verification
00785df
@corlard3y
update dropdown
be9e0a6
@corlard3y
add social handles to rewards points
71d7d6f
@corlard3y
add rewards handle list item
1092267
@corlard3y
update rewards email telegram
da2589e
@corlard3y
update index
ccc1aec
@corlard3y
update telegram and discord
a2dbe83
@corlard3y
add usersocial profile hook
0e178e9
@corlard3y
adjust prod url
98dac93
@corlard3y
add baseurl and form error message
a50cc27
@corlard3y
add enabled filter
5019452
@corlard3y corlard3y linked an issue Dec 6, 2024 that may be closed by this pull request
👾 [Other] - <User Profile/Email API Integration> #1964
Closed
@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 6, 2024

All looks good.

@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 6, 2024 •
edited
Loading

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

@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 6, 2024

All looks good.

@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 9, 2024

All looks good.

@github-actions GitHub Actions
Copy link

All looks good.

rohitmalhotra1420
rohitmalhotra1420 requested changes Dec 12, 2024
View reviewed changes
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/UserProfileSettings/AddEmail.tsx 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 Show resolved Hide resolved
src/components/UserProfileSettings/AddTelegram.tsx Outdated Show resolved Hide resolved
src/components/UserProfileSettings/AddTelegram.tsx Show resolved Hide resolved
src/modules/dashboard/Dashboard.tsx Outdated Show resolved Hide resolved
@github-actions GitHub Actions
Copy link

All looks good.

@github-actions GitHub Actions
Copy link

All looks good.

@github-actions GitHub Actions
Copy link

All looks good.

@rohitmalhotra1420 rohitmalhotra1420 merged commit b54769c into main Dec 21, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rohitmalhotra1420 rohitmalhotra1420 rohitmalhotra1420 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

👾 [Other] - <User Profile/Email API Integration>
5 participants
@corlard3y @rohitmalhotra1420 @meKushdeepSingh @akp111 @abhishek-01k