From 6ac6241d436fa2422c227cad8cabd47e46ba4e77 Mon Sep 17 00:00:00 2001 From: DomW Date: Thu, 12 Dec 2024 11:01:04 +0000 Subject: [PATCH] refactor(login-page): remove reset password page feature flag (#2507) * refactor(login-page): remove reset password page feature flag * fix: failing test * fix: failing test date --- .../chat-view-container/chat-view.test.tsx | 4 ++-- src/pages/login/login-component.tsx | 13 +++++-------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/components/chat-view-container/chat-view.test.tsx b/src/components/chat-view-container/chat-view.test.tsx index e268fc9c5..1424df7ee 100644 --- a/src/components/chat-view-container/chat-view.test.tsx +++ b/src/components/chat-view-container/chat-view.test.tsx @@ -257,13 +257,13 @@ describe('ChatView', () => { it('returns the formatted date for the same year', () => { // setting the date here is not ideal as at some point this will fail - const currentYearDate = moment('2024-12-11'); // Example date within the same year + const currentYearDate = moment('2025-12-11'); // Example date within the same year const messages = [ { id: 111, message: 'what', createdAt: currentYearDate.valueOf() } as MessageModel, ]; const wrapper = subject({ messages }); - expect(wrapper.find('.message__header-date').text()).toEqual('Wed, Dec 11'); + expect(wrapper.find('.message__header-date').text()).toEqual('Dec 11, 2025'); }); it('returns the formatted date for previous years', () => { diff --git a/src/pages/login/login-component.tsx b/src/pages/login/login-component.tsx index 297e320d8..42b76a4fa 100644 --- a/src/pages/login/login-component.tsx +++ b/src/pages/login/login-component.tsx @@ -12,7 +12,6 @@ import { ThemeEngine, Themes } from '@zero-tech/zui/components/ThemeEngine'; import { bemClassName } from '../../lib/bem'; import './login.scss'; -import { FeatureFlag } from '../../components/feature-flag'; import { assertAllValuesConsumed } from '../../lib/enum'; const cn = bemClassName('login-main'); @@ -65,13 +64,11 @@ export class LoginComponent extends React.Component { Not on ZERO? Create account - - {stage === LoginStage.EmailLogin && ( - - Forgot your password? Reset - - )} - + {stage === LoginStage.EmailLogin && ( + + Forgot your password? Reset + + )} ); }