Skip to content

Commit 4fef25d

Browse files
committed
fix: toggle forceShow input now works
1 parent 0ffdad1 commit 4fef25d

File tree

4 files changed

+5
-14
lines changed

4 files changed

+5
-14
lines changed

ts/components/leftpane/conversation-list-item/ConversationListItem.tsx

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import { MemoConversationListItemContextMenu } from '../../menu/ConversationList
3030
import { ConversationListItemHeaderItem } from './HeaderItem';
3131
import { MessageItem } from './MessageItem';
3232
import { openConversationWithMessages } from '../../../state/ducks/conversations';
33-
import { useShowConversationSettingsFor } from '../../menuAndSettingsHooks/useShowConversationSettingsFor';
3433

3534
const Portal = ({ children }: { children: ReactNode }) => {
3635
return createPortal(children, document.querySelector('.inbox.index') as Element);
@@ -76,8 +75,6 @@ export const ConversationListItem = (props: Props) => {
7675
const isSearch = useIsSearchingForType('global');
7776
const selectedConvo = useSelectedConversationKey();
7877

79-
const showConvoSettingsCb = useShowConversationSettingsFor(conversationId);
80-
8178
const isSelectedConvo = conversationId === selectedConvo && !isNil(selectedConvo);
8279

8380
if (isSearch) {
@@ -92,16 +89,10 @@ export const ConversationListItem = (props: Props) => {
9289
(e: MouseEvent<HTMLDivElement>) => {
9390
// mousedown is invoked sooner than onClick, but for both right and left click
9491
if (e.button === 0) {
95-
if (isSelectedConvo) {
96-
showConvoSettingsCb?.({
97-
settingsModalPage: 'default',
98-
});
99-
} else {
100-
void openConversationWithMessages({ conversationKey: conversationId, messageId: null });
101-
}
92+
void openConversationWithMessages({ conversationKey: conversationId, messageId: null });
10293
}
10394
},
104-
[conversationId, isSelectedConvo, showConvoSettingsCb]
95+
[conversationId]
10596
);
10697

10798
return (

ts/components/leftpane/overlay/OverlayInvite.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export const OverlayInvite = () => {
8282
value={ourSessionID}
8383
editable={false}
8484
centerText={true}
85-
isTextArea={false}
85+
isTextArea={true}
8686
padding={'var(--margins-xl) var(--margins-sm)'}
8787
ariaLabel={localize('accountId').toString()}
8888
inputDataTestId="your-account-id"

ts/components/registration/stages/RestoreAccount.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ const RecoveryPhraseInput = ({
146146
<SimpleSessionInput
147147
ariaLabel="Recovery password input"
148148
autoFocus={true}
149-
type="password"
149+
type={forceShow ? 'text' : 'password'}
150150
placeholder={window.i18n('recoveryPasswordEnter')}
151151
value={recoveryPassword}
152152
onValueChanged={(seed: string) => {

ts/themes/constants/colors.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ type ThemeColors = {
125125
DANGER: string;
126126
WARNING: string;
127127
DISABLED: string;
128-
COLOR1: string;
129128
COLOR0: string;
129+
COLOR1: string;
130130
COLOR2: string;
131131
COLOR3: string;
132132
COLOR4: string;

0 commit comments

Comments
 (0)