Update Rewards Dashboard flow #1699

corlard3y · 2024-07-05T02:43:40Z

Pull Request Template

#1694

[😈 [Feature Enhancement] - <Update Rewards Creation dashboard flow> #1694 ]

Description

Problem/Feature:
Add Unlock Profile Button on dashboard(referral section), so users can now see dashboard and other pages when user is not registered yet. Registration will only be done when you click on unlock profile button.
Add onClick function to unlock profile to call useGenerateUserId hook.
Also the unlock profile modal sub heading will be different for only this case: Unlock your profile to proceed.

Type of Change

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

Followed frontend guidelines as per the Guidelines Notion Doc

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

github-actions · 2024-07-05T02:45:01Z

In File: src/contexts/AppContext.tsx:

There are missing closing brackets for the useState hooks for 'connectedPeerID' and 'blockedLoading'.
There is a missing closing curly brace for the useSelector function.
There is a missing closing curly brace for the 'connectWallet' function.
The 'retrieveUserPGPKeyFromStorage' function is missing a closing curly brace for the if statement.
The 'isPGPKey' function is missing a closing curly brace for the if statement.
The 'handleConnectWallet' function is missing a closing curly brace for the if statement.
The 'getUser' function is defined but not implemented.

In File: src/modules/rewards/Rewards.tsx:

The 'useState' hook for 'isUserProfileUnlocked' is used incorrectly. It should be either 'useState' or 'useContext(AppContext)'.
There are missing implementation details for some functions like 'handleUser'.
There is a typo in the useEffect dependency array as 'status == 'success'' which should be 'status === 'success''.
There are some formatting issues with the Button component.

In File: src/modules/rewards/components/ActivityStatusButton.tsx:

The closing brace for the ActivityStatusButton component is missing.

In File: src/modules/rewards/components/DashboardSection.tsx:

There is a missing closing brace for the Box component.
There is a missing closing brace for the DashboardSection component.

In File: src/modules/rewards/components/ReferralSection.tsx:

The file is empty, and the content needs to be added.

In File: src/modules/rewards/hooks/useGenerateUserId.tsx:

The file is empty, and the content needs to be added.

In File: src/primaries/Profile.tsx:

The file is not specified in the content provided, so it is unclear what needs to be reviewed.

In File: src/types/context.ts:

The file is not specified in the content provided, so it is unclear what needs to be reviewed.

Overall, these are the identified issues and areas for improvement in the provided files.

github-actions · 2024-07-05T02:49:03Z

PR Preview Action v1.4.7
Preview removed because the pull request was closed.
2024-07-10 06:00 UTC

github-actions · 2024-07-05T02:58:33Z

All looks good.

rohitmalhotra1420

@corlard3y given it a top level review. Let's connect on a call for a functional review.

rohitmalhotra1420 · 2024-07-05T05:51:20Z

src/components/chat/unlockProfile/UnlockProfile.tsx

@@ -34,12 +42,13 @@ export enum PROFILESTATE {
 type UnlockProfileModalProps = {
  InnerComponentProps: {
    type: UNLOCK_PROFILE_TYPE | undefined;
+    label?: string;


Suggested change

label?: string;

description?: string;

rohitmalhotra1420 · 2024-07-05T05:51:33Z

src/components/chat/unlockProfile/UnlockProfileWrapper.tsx

@@ -31,12 +32,15 @@ const UnlockProfileWrapper = ({ type = DEFAULT_PROPS.type, showConnectModal }: I
    }
  }, [type]);

+  console.log(label, 'label');


Suggested change

console.log(label, 'label');

rohitmalhotra1420 · 2024-07-05T05:51:46Z

src/components/chat/unlockProfile/UnlockProfileWrapper.tsx

 }

 const DEFAULT_PROPS = {
  type: UNLOCK_PROFILE_TYPE.MODAL,
 };

-const UnlockProfileWrapper = ({ type = DEFAULT_PROPS.type, showConnectModal }: IntroContainerProps) => {
+const UnlockProfileWrapper = ({ type = DEFAULT_PROPS.type, showConnectModal, label }: IntroContainerProps) => {


Suggested change

const UnlockProfileWrapper = ({ type = DEFAULT_PROPS.type, showConnectModal, label }: IntroContainerProps) => {

const UnlockProfileWrapper = ({ type = DEFAULT_PROPS.type, showConnectModal, description }: IntroContainerProps) => {

rohitmalhotra1420 · 2024-07-05T05:51:53Z

src/components/chat/unlockProfile/UnlockProfileWrapper.tsx

@@ -11,14 +11,15 @@ export enum UNLOCK_PROFILE_TYPE {

 interface IntroContainerProps {
  type?: UNLOCK_PROFILE_TYPE;
-  showConnectModal?: boolean
+  showConnectModal?: boolean;
+  label?: string;


Suggested change

label?: string;

description?: string;

rohitmalhotra1420 · 2024-07-05T05:52:46Z

src/modules/rewards/Rewards.tsx

@@ -99,6 +121,7 @@ const Rewards: FC<RewardsProps> = () => {
          <UnlockProfileWrapper
            type={UNLOCK_PROFILE_TYPE.MODAL}
            showConnectModal={showConnectModal}
+            label="Unlock your profile to proceed."


Suggested change

label="Unlock your profile to proceed."

description="Unlock your profile to proceed."

rohitmalhotra1420 · 2024-07-05T05:53:24Z

src/modules/rewards/Rewards.tsx

      </Box>

-      {userPushSDKInstance && userPushSDKInstance?.readmode() && showConnectModal && (
+      {isWalletConnected && userPushSDKInstance && userPushSDKInstance?.readmode() && showConnectModal && (


Suggested change

{isWalletConnected && userPushSDKInstance && userPushSDKInstance?.readmode() && showConnectModal && (

{isProfileConnectModalVisible && (

rohitmalhotra1420 · 2024-07-05T05:58:59Z

src/modules/rewards/components/ReferralSection.tsx

+              <ActivityStatusButton
+                size="small"
+                variant="primary"
+                onClick={generateUser}
+                disabled={false}
+                label="Unlock Profile"
+                isLoading={isPending}
+              />


We should have a separate component for this. Not mix the the logic here. Both buttons server different purposes. Let's uses blocks button directly here.

rohitmalhotra1420 · 2024-07-05T05:59:32Z

src/modules/rewards/hooks/useGenerateUserId.tsx

+    const ref = sessionStorage.getItem('ref');
    const data = {
      ...(ref && { refPrimary: ref }),
      userWallet: caip10WalletAddress,


This can be done out side a function as well. Don't need to initialise a function for this

rohitmalhotra1420 · 2024-07-05T06:00:13Z

src/modules/rewards/components/DashboardSection.tsx

@@ -28,7 +28,7 @@ const DashboardSection: FC<DashboardSectionProps> = ({ onGetStarted }) => {
    isFetching,
  } = useGetUserRewardsDetails({ caip10WalletAddress: caip10WalletAddress, enabled: isWalletConnected });

-  const isLoading = isUserLoading || !isSuccess;
+  const isLoading = isUserLoading;


We can directly use isUserLoading and remove isLoading

rohitmalhotra1420 · 2024-07-05T06:00:35Z

src/modules/rewards/components/ActivityStatusButton.tsx

+  variant?: ButtonVariant;
+  size?: ButtonSize;


Not required. We will not use this button on referral section

github-actions · 2024-07-08T06:52:45Z

I have reviewed the code in the specified files. Here are the identified issues:

In 'UnlockProfile.tsx':

Typo in 'Internal Compoonents' should be 'Internal Components'.
'INTERFACE' keyword is missing before the 'type UnlockProfileModalProps'.
'useDeviceWidthCheck' should be 'useDeviceWidthCheck()' in the 'const isMobile' assignment.
'handleRememberMeChange' function is missing closing bracket '}'.
'missing "type" in props declaration inside the RenderToolTip component.'
'tooltipContent' is not closed properly in the RenderToolTip component.
In the RenderToolTip component, the tooltipContent text is not enclosed in quotes.
'SkeletonContainer' component is defined but not used.
'CustomCheckbox' component should have lineHeight attribute enclosed in quotes.
The 'RenderToolTip' component is missing the return statement within its function.

In 'UnlockProfileWrapper.tsx':

'unlockProfileWrapper' component is missing 'className' props in the return statement.

In 'ActivityButton.tsx':

'if' block missing closing bracket '}' before the final 'return' statement.

Overall, these issues need to be rectified to ensure the proper functionality and readability of the code.

Please make the necessary corrections and ensure all components are functioning correctly. Let me know if you need further assistance.

github-actions · 2024-07-08T14:06:15Z

I have reviewed the provided code, and everything looks good.

* update unlock profile * add modal back to activities * update label in unlock modal * update flow * New Discord Flow Added * fixes done * fixed the discord verification page alignment * update useWithAuthButton * add button onclick * add unlock profile listener * fix create flows --------- Co-authored-by: abhishek-01k <[email protected]> Co-authored-by: rohitmalhotra1420 <[email protected]>

corlard3y added 2 commits July 5, 2024 01:30

update unlock profile

bdb8c08

add modal back to activities

4d35a54

corlard3y linked an issue Jul 5, 2024 that may be closed by this pull request

😈 [Feature Enhancement] - <Update Rewards Creation dashboard flow> #1694

Closed

Merge branch 'main' into 1694-rewards-creation-flow

1ad5156

update label in unlock modal

ab62390

corlard3y requested a review from rohitmalhotra1420 July 5, 2024 02:58

rohitmalhotra1420 requested changes Jul 5, 2024

View reviewed changes

update flow

7ca1089

New Discord Flow Added

2a8d041

rohitmalhotra1420 and others added 6 commits July 8, 2024 20:40

fixes done

3b13c1d

fixed the discord verification page alignment

7801343

update useWithAuthButton

df203a9

add button onclick

a070b1e

add unlock profile listener

2f51792

fix create flows

d800efb

rohitmalhotra1420 approved these changes Jul 10, 2024

View reviewed changes

rohitmalhotra1420 merged commit c257347 into main Jul 10, 2024
1 of 2 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update Rewards Dashboard flow #1699

Update Rewards Dashboard flow #1699

corlard3y commented Jul 5, 2024 •

edited

Loading

github-actions bot commented Jul 5, 2024

github-actions bot commented Jul 5, 2024 •

edited

Loading

github-actions bot commented Jul 5, 2024

rohitmalhotra1420 left a comment

rohitmalhotra1420 Jul 5, 2024

rohitmalhotra1420 Jul 5, 2024

rohitmalhotra1420 Jul 5, 2024

rohitmalhotra1420 Jul 5, 2024

rohitmalhotra1420 Jul 5, 2024

rohitmalhotra1420 Jul 5, 2024

rohitmalhotra1420 Jul 5, 2024

rohitmalhotra1420 Jul 5, 2024

rohitmalhotra1420 Jul 5, 2024

rohitmalhotra1420 Jul 5, 2024

github-actions bot commented Jul 8, 2024

github-actions bot commented Jul 8, 2024

	const UnlockProfileWrapper = ({ type = DEFAULT_PROPS.type, showConnectModal, label }: IntroContainerProps) => {
	const UnlockProfileWrapper = ({ type = DEFAULT_PROPS.type, showConnectModal, description }: IntroContainerProps) => {

	label="Unlock your profile to proceed."
	description="Unlock your profile to proceed."

	{isWalletConnected && userPushSDKInstance && userPushSDKInstance?.readmode() && showConnectModal && (
	{isProfileConnectModalVisible && (

Update Rewards Dashboard flow #1699

Update Rewards Dashboard flow #1699

Conversation

corlard3y commented Jul 5, 2024 • edited Loading

Pull Request Template

Description

Type of Change

Checklist

Frontend Guidelines

Build & Testing

Screenshots/Video with Explanation

Additional Context

Review & Approvals

Notes

github-actions bot commented Jul 5, 2024

github-actions bot commented Jul 5, 2024 • edited Loading

github-actions bot commented Jul 5, 2024

rohitmalhotra1420 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Jul 8, 2024

github-actions bot commented Jul 8, 2024

corlard3y commented Jul 5, 2024 •

edited

Loading

github-actions bot commented Jul 5, 2024 •

edited

Loading