Resolves #[Issue Number if there]

• 1
• 2

• I have pull latest changes from main branch
• I have tested the changes locally
• I have run npm run lint:fix locally
• I have performed a self-review of my code
• I assure there is no similar/duplicate pull request regarding same issue