-
Notifications
You must be signed in to change notification settings - Fork 44
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
feat: add alert ds component #1781
Conversation
After the corrections, the code looks good. |
|
@mishramonalisha76 please review the PR. |
src/blocks/alert/Alert.tsx
Outdated
import { getTextVariantStyles } from 'blocks/Blocks.utils'; | ||
|
||
export type AlertProps = { | ||
/* Child react nodes rendered by Box */ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/* Child react nodes rendered by Box */ | |
/* Child react nodes rendered by Alert */ |
src/blocks/alert/Alert.tsx
Outdated
retryable?: boolean; | ||
/* Retry function to be called on retry button click */ | ||
onRetry?: () => void; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this can be a prop like action?: ReactNode; and will a custom react node .
So instead of retryable, onRetry and retryText it will one custom action component
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
According to the design, we'll not having custom components here, will only require a change of text message later on if required. Let's remove retryable
and closeable
and use the functions. Will reduce number of props being passed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@kalashshah let's do actionText, onAction and onClose.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done, please check
src/blocks/alert/Alert.tsx
Outdated
border-radius: var(--radius-sm); | ||
justify-content: center; | ||
white-space: nowrap; | ||
padding: 12px; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
padding: 12px; | |
padding: var(--spacing-xs); |
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', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Check text area component for the color implementation for different variants. This constant isnt needed, it can be done in a much optimised way
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is similar to how we have implemented alertModalIcon
in the AlertModal.
src/blocks/alert/Alert.tsx
Outdated
white-space: nowrap; | ||
padding: 12px; | ||
justify-content: space-between; | ||
border: 1px solid var(--${({ borderColor }) => borderColor}); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
1px can be var(--border-sm)
src/blocks/alert/Alert.tsx
Outdated
description?: string; | ||
} & TransformedHTMLAttributes<HTMLDivElement>; | ||
|
||
const StyledAlert = styled.div<AlertProps & { iconColor: ThemeColors; borderColor: ThemeColors; bgColor: ThemeColors }>` |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
instead of the iconColor, borderColor and bgColor pass the variant and do it like it is done in TextArea component
`; | ||
|
||
const Heading = styled.p` | ||
${() => getTextVariantStyles('h5-semibold', 'components-alert-text-default')} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add font sizes , weight, style and line height for the texts
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please check the implementation of the getTextVariantStyles
, it will appropriately add the required styles to the text.
src/blocks/alert/Alert.tsx
Outdated
onRetry, | ||
retryable = true, | ||
retryText = 'Try Again', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not needed can be replaced by action prop
src/blocks/alert/Alert.tsx
Outdated
variant = 'info', | ||
...props | ||
}) => { | ||
const { icon: Icon, iconColor, borderColor, bgColor, ctaColor } = alertVariants[variant]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is not needed
src/blocks/alert/Alert.tsx
Outdated
<StyledLink | ||
ctaColor={ctaColor} | ||
onClick={onRetry} | ||
> | ||
{retryText} | ||
</StyledLink> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
replace with action component, even ctaLink parameter isnot needed
The code provided seems to be well-structured and no obvious mistakes or typos were found. The logic also appears to be sound. All looks good. |
I found some issues in the code:
Overall, the code needs some cleaning up to improve its readability and maintainability. All looks good. |
* feat: add alert ds component * chore: update alert ds acc to review * chore: update component acc to review
* added loading colour * add icon * add components * update styles * update mobile view * update titles * change button labels * update multiplier * update useDailyRewards hook * update unlock profile modal changes * update usedailyrewards hook * fix isLoading onclick * update locked status/ rewards ui * update new users status * add skeleton loader * comment out stake push activities * update skeleton loader * update locked icon * format text * feat: add alert ds component (#1781) * feat: add alert ds component * chore: update alert ds acc to review * chore: update component acc to review * update alert for error messages * update indexes * Update Dashboard.tsx * remove unusued * fixed review comments * Update Button.tsx * update completed state * fixed the spinner and button * fixed the spinner and button * Added spinner component (#1783) * added spinner component * added review changes * added correct variants * added the review comments * added the review comments * Add progress bar to ds (#1787) * feat: add progress bar to ds * chore: update progress bar according to review * add loading state * update locked status * update isLocked * update loading state * remove disabled state from button * update locked divider * update error message * fix icons and illustrations * update naming and imports * update reward activites hook * update type * add types * resolve conments * update box * update text changes * update text * update points real time * update mutiplier conditions in bonus * update gap * update padding referal section * adjust daily section ui * update stake array * update stake api * update rewards verification hook * fix: yield farming layouts and resize buttons to take full width (#1793) * Add support for erc1155 (#1794) * chore: add support for erc1155 * chore: update uiweb version to include erc1155 support * Replaced older tab implementation in trending channels with the new tab block component (#1800) * added * moved function to utils * tab changes * reverted rewards tab change * Update Dashboard.utils.ts * Opt-In Dropdown for dashboard (#1802) * Opt-In Dropdown for dashboard * Fixed the comments and issues * Fixed the context issue * DS-Dapp Notification Component (#1801) * add in-app semantics and block files * update notification component * add localstorage identifier * update library * add duration option * resolve comments * update comment fixes * fix comments * testing notification * update notification component --------- Co-authored-by: rohitmalhotra1420 <[email protected]> * DApp-1804 tag component added in blocks (#1805) * tag in progress * implemented tag component * Tag component implemented in blocks * update hook and export component * update code * add componentdid mount flow * update mount logic * fix stake font size * fix conflicts * Fixed create channel ui , fixed message for unlock profile, removed governance from sidebar (#1817) * fixed minor ui issues * fixed minor ui issues * fixed minor ui issues * fixed select text color * fixed select text color * fixed select text color * fixed chain issue * fixed send notif delegate issue (#1822) * fixed send notif delegate issue * Fixed the send notification button on the navigation for delegatee list * added fixes for alias * added fixes for alias * fixed review comment --------- Co-authored-by: abhishek-01k <[email protected]> * DApp-1799 blocks/table (#1824) * table in progress * in progress * in progress * table complete * fixed header route + reverted changes * added alignment support * set debug to false * fix comments * export type and fix issues * update rewards notification * fix loading state * add activit days * update locked status * updates test whitelist file for nft claims * fixed smart contract for alpha nft * update reset time * refactor code * update fixes * stake push * update types * update yarn.lock * update icons * update icons batch 2 * sort stake section * add local storage key * update hasEnded and has text * fixed channel notifications (#1852) * added the new monotone icons (#1857) * added support for icons in tag components (#1853) * update stat in yield farming data store (#1859) * update refetch leaderboard * fix double text issue - media query * update icon * hide notifs * update font sizes * fix invalid verification proof issue * remove console * update success flow * fixes done * removed the png file * lock file fixed * remove isActive Account in auth hook --------- Co-authored-by: Monalisha Mishra <[email protected]> Co-authored-by: rohitmalhotra1420 <[email protected]> Co-authored-by: Kalash Shah <[email protected]> Co-authored-by: Monalisha Mishra <[email protected]> Co-authored-by: Abhishek <[email protected]> Co-authored-by: abhishek-01k <[email protected]>
Pull Request Template
Ticket Number
Description
Problem/Feature:
Type of Change
Checklist
Frontend Guidelines
Build & Testing
Screenshots/Video with Explanation
Review & Approvals
Notes