Skip to content

Commit 19b8fcc

Browse files
authored
Merge pull request #1419 from Bilb/feat/updated-conversation-settings
feat: updated conversation settings
2 parents e1a0455 + 5070626 commit 19b8fcc

File tree

183 files changed

+5912
-3472
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

183 files changed

+5912
-3472
lines changed

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,11 @@
7979
"fs-extra": "11.3.0",
8080
"glob": "10.4.5",
8181
"image-type": "^4.1.0",
82-
"libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.5.3/libsession_util_nodejs-v0.5.3.tar.gz",
82+
"libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.5.4/libsession_util_nodejs-v0.5.4.tar.gz",
8383
"libsodium-wrappers-sumo": "^0.7.15",
8484
"linkify-it": "^5.0.0",
8585
"lodash": "^4.17.21",
8686
"long": "^4.0.0",
87-
"lucide-react": "0.473.0",
8887
"maxmind": "^4.3.24",
8988
"mic-recorder-to-mp3": "^2.2.2",
9089
"node-fetch": "^2.7.0",

preload.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ window.getUserKeys = async () => {
5555

5656
window.sessionFeatureFlags = {
5757
replaceLocalizedStringsWithKeys: false,
58-
showSettingsOnStart: false,
5958
// Hooks
6059
useClosedGroupV2QAButtons: false, // TODO DO NOT MERGE Remove after QA
6160
useOnionRequests: true,

stylesheets/_index.scss

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,3 @@
99
flex-direction: column;
1010
background-color: var(--background-primary-color);
1111
}
12-
13-
.edit-profile-dialog,
14-
.update-group-dialog {
15-
.content {
16-
max-width: 100% !important;
17-
}
18-
19-
.buttons {
20-
margin: 8px;
21-
}
22-
23-
.title-text {
24-
font-size: large;
25-
text-align: center;
26-
}
27-
28-
.module-avatar {
29-
display: block;
30-
margin-bottom: 1rem;
31-
}
32-
33-
.avatar-center {
34-
display: flex;
35-
justify-content: center;
36-
}
37-
38-
.avatar-center-inner {
39-
display: flex;
40-
}
41-
}

stylesheets/_rtl.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
body.rtl {
22
input,
3+
button,
34
textarea,
45
.module-left-pane,
56
.module-conversation-list-item,

stylesheets/_session.scss

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -270,29 +270,6 @@ label {
270270
}
271271
}
272272

273-
.image-upload-section {
274-
display: flex;
275-
align-items: center;
276-
justify-content: center;
277-
position: absolute;
278-
cursor: pointer;
279-
width: 80px;
280-
height: 80px;
281-
border-radius: 100%;
282-
background-color: var(--lightbox-background-color);
283-
opacity: 0;
284-
transition: var(--default-duration);
285-
286-
&:after {
287-
content: 'Edit';
288-
color: var(--white-color);
289-
}
290-
291-
&:hover {
292-
opacity: 1;
293-
}
294-
}
295-
296273
.conversation-loader {
297274
position: absolute;
298275
top: 50%;

stylesheets/_session_conversation.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
}
9393

9494
.composition-container {
95+
position: relative;
9596
display: flex;
9697
justify-content: center;
9798
align-items: center;

stylesheets/fonts.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
}
100100

101101
/** Icon font
102-
* Current: Lucide v0.473.0
102+
* Current: Lucide v0.488.0
103103
* Download from https://github.com/lucide-icons/lucide/releases
104104
* NOTE Make sure the lucide-react package is the same version
105105
*/

ts/components/MemberListItem.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ const PromoteButton = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: Group
305305
buttonShape={SessionButtonShape.Square}
306306
buttonType={SessionButtonType.Solid}
307307
buttonColor={SessionButtonColor.Danger}
308-
text={window.i18n('promote')} // TODO DO NOT MERGE Remove after QA
308+
text={window.i18n('promote')}
309309
onClick={() => {
310310
void promoteUsersInGroup({
311311
groupPk,

ts/components/NoticeBanner.tsx

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { SessionDataTestId } from 'react';
22
import styled from 'styled-components';
33
import { Flex } from './basic/Flex';
44
import { SessionIconButton, SessionIconType } from './icon';
5-
import { StyledRootDialog } from './dialog/StyledRootDialog';
65

76
const StyledNoticeBanner = styled(Flex)<{ isClickable: boolean }>`
87
background-color: var(--primary-color);
@@ -54,28 +53,3 @@ export const NoticeBanner = (props: NoticeBannerProps) => {
5453
</StyledNoticeBanner>
5554
);
5655
};
57-
58-
const StyledGroupInviteBanner = styled(Flex)`
59-
position: relative;
60-
color: var(--black-color);
61-
background-color: var(--orange-color);
62-
font-size: var(--font-size-sm);
63-
padding: var(--margins-xs) var(--margins-lg);
64-
text-align: center;
65-
flex-shrink: 0;
66-
67-
// when part a a dialog, invert it and make it narrower (as the dialog grows to make it fit)
68-
${StyledRootDialog} & {
69-
max-width: 300px;
70-
color: var(--warning-color);
71-
background-color: inherit;
72-
}
73-
`;
74-
75-
export const GroupInviteRequiredVersionBanner = () => {
76-
return (
77-
<StyledGroupInviteBanner data-testid="version-warning">
78-
{window.i18n('groupInviteVersion')}
79-
</StyledGroupInviteBanner>
80-
);
81-
};

ts/components/SessionHeaderSearchInput.tsx

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)