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

feat: Dismiss Dialog for duplicate expenses #3175

Merged
merged 8 commits into from
Aug 27, 2024
Merged

Conversation

devendrafyle
Copy link
Contributor

@devendrafyle devendrafyle commented Aug 19, 2024

Dismiss Dialog

image

Clickup

https://app.clickup.com/t/86cw6epah

Copy link
Contributor

@Dimple16 Dimple16 left a 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;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does 20px work?

Copy link
Contributor Author

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;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use the color variable

Copy link
Contributor Author

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
Copy link
Contributor

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?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

eslint error

Copy link
Contributor Author

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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

Copy link
Contributor Author

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

Copy link
Contributor Author

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;
Copy link
Contributor

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

Copy link
Contributor Author

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

@@ -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%);
Copy link
Contributor

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

Copy link
Contributor Author

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;
Copy link
Contributor

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

Copy link
Contributor Author

@devendrafyle devendrafyle Aug 20, 2024

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

@devendrafyle devendrafyle requested a review from Dimple16 August 20, 2024 05:49
Copy link
Contributor

@Dimple16 Dimple16 left a 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[];
Copy link
Contributor

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?

Copy link
Contributor Author

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated this

Copy link
Contributor

@Dimple16 Dimple16 left a 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

@devendrafyle devendrafyle requested a review from Dimple16 August 22, 2024 09:04
* 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>
@github-actions github-actions bot added size/L Large PR and removed size/M Medium PR labels Aug 26, 2024
Copy link

Unit Test Coverage % values
Statements 95.88% ( 19087 / 19907 )
Branches 91.17% ( 10468 / 11481 )
Functions 94.27% ( 5711 / 6058 )
Lines 95.91% ( 18220 / 18996 )

@devendrafyle devendrafyle merged commit 8200b6c into master Aug 27, 2024
6 checks passed
devendrafyle added a commit that referenced this pull request Aug 28, 2024
* 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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/L Large PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants