-
Notifications
You must be signed in to change notification settings - Fork 15
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: Dismiss Dialog for duplicate expenses #3175
Conversation
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.
added comments
.dismiss-dialog { | ||
&--header { | ||
font-size: 16px; | ||
line-height: 20.48px; |
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.
Does 20px
work?
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.
yep
display: flex; | ||
padding: 12px 16px; | ||
justify-content: center; | ||
color: #fff; |
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.
Use the color variable
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.
ok
styleUrls: ['./dismiss-dialog.component.scss'], | ||
}) | ||
export class DismissDialogComponent implements OnInit { | ||
// eslint-disable-next-line |
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.
why have we added this?
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.
eslint error
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.
fixed this by adding the observable type
|
||
// eslint-disable-next-line |
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.
?
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.
eslint throwing error here, else need to create new modal for it
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.
fixed this by creating new type in model file
@@ -952,6 +952,17 @@ ion-modal.flag-unflag-modal { | |||
padding-top: 0 !important; | |||
} | |||
|
|||
ion-popover.dismiss-dialog { | |||
--width: 298px; |
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 this in different resolutions
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.
i have checked this, seems to working fine
src/theme/colors.scss
Outdated
@@ -47,6 +47,7 @@ $shadow-lg: rgba(44, 48, 78, 0.1); | |||
|
|||
$brand-primary: #ff3366 !default; | |||
$brand-primary-light: #fe5196 !default; | |||
$brand-gradient: linear-gradient(162deg, #f36 3.01%, #fe5196 111.5%); |
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 required, we already have $pink-gradient
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.
ahh right, will fix this
font-size: 14px; | ||
line-height: 18px; | ||
color: $blue-black; | ||
font-weight: 400; |
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 should be there by default, check if it's not required
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.
no, actually that is for different dialog, for this dismiss dialog we need to add this class styling since the color
is different by default and we also want margin-top
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.
one question
@@ -0,0 +1,3 @@ | |||
import { Expense } from './expense.model'; | |||
|
|||
export type Expenses = Expense[]; |
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.
don't we have this already?
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.
we do not have the exact model already, but we can skip this
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.
Updated this
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.
I don't think the new model expenses
is required
* test: Added unit test cases for dismiss dialog * added more test cases and fixed minor comments --------- Co-authored-by: Devendra Singh Rana <devendra@Devendras-MacBook-Air.local>
|
* feat: Dismiss dialog for potential duplicate expenses * minor fixes * minor comment fixes * removed not required model * removed not used model file * test: Added unit test cases for dismiss dialog (#3176) * test: Added unit test cases for dismiss dialog * added more test cases and fixed minor comments --------- Co-authored-by: Devendra Singh Rana <devendra@Devendras-MacBook-Air.local> * improve unit test coverage --------- Co-authored-by: Devendra Singh Rana <devendra@Devendras-MacBook-Air.local>
Dismiss Dialog
Clickup
https://app.clickup.com/t/86cw6epah