diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx
index 6dc2d57f3c..04d0644610 100644
--- a/.storybook/preview.tsx
+++ b/.storybook/preview.tsx
@@ -7,16 +7,17 @@ import React, { StrictMode } from 'react';
import '../stylesheets/manifest.scss';
import '../stylesheets/tailwind-config.css';
-
import * as styles from './styles.scss';
import messages from '../_locales/en/messages.json';
-import { StorybookThemeContext } from './StorybookThemeContext.js';
-import { ThemeType } from '../ts/types/Util.js';
-import { setupI18n } from '../ts/util/setupI18n.js';
-import { HourCyclePreference } from '../ts/types/I18N.js';
+
import { Provider } from 'react-redux';
import { Store, combineReducers, createStore } from 'redux';
import { Globals } from '@react-spring/web';
+
+import { StorybookThemeContext } from './StorybookThemeContext.js';
+import { SystemThemeType, ThemeType } from '../ts/types/Util.js';
+import { setupI18n } from '../ts/util/setupI18n.js';
+import { HourCyclePreference } from '../ts/types/I18N.js';
import { AxoProvider } from '../ts/axo/AxoProvider.js';
import { StateType } from '../ts/state/reducer.js';
import {
@@ -30,6 +31,10 @@ import { FunProvider } from '../ts/components/fun/FunProvider.js';
import { EmojiSkinTone } from '../ts/components/fun/data/emojis.js';
import { MOCK_GIFS_PAGINATED_ONE_PAGE } from '../ts/components/fun/mocks.js';
+import type { FunEmojiSelection } from '../ts/components/fun/panels/FunPanelEmojis.js';
+import type { FunGifSelection } from '../ts/components/fun/panels/FunPanelGifs.js';
+import type { FunStickerSelection } from '../ts/components/fun/panels/FunPanelStickers.js';
+
setEnvironment(Environment.Development, true);
const i18n = setupI18n('en', messages);
@@ -105,10 +110,10 @@ window.SignalContext = {
},
nativeThemeListener: {
- getSystemTheme: () => 'light',
+ getSystemTheme: () => SystemThemeType.light,
subscribe: noop,
unsubscribe: noop,
- update: () => 'light',
+ update: () => SystemThemeType.light,
},
Settings: {
themeSetting: {
@@ -249,6 +254,15 @@ function withFunProvider(Story, context) {
fetchGifsSearch={() => Promise.resolve(MOCK_GIFS_PAGINATED_ONE_PAGE)}
fetchGifsFeatured={() => Promise.resolve(MOCK_GIFS_PAGINATED_ONE_PAGE)}
fetchGif={() => Promise.resolve(new Blob([new Uint8Array(1)]))}
+ onSelectEmoji={function (emojiSelection: FunEmojiSelection): void {
+ console.log('onSelectEmoji', emojiSelection);
+ }}
+ onSelectSticker={function (stickerSelection: FunStickerSelection): void {
+ console.log('onSelectSticker', stickerSelection);
+ }}
+ onSelectGif={function (gifSelection: FunGifSelection): void {
+ console.log('onSelectGif', gifSelection);
+ }}
>
diff --git a/.storybook/styles.scss b/.storybook/styles.scss
index aa277952f5..54ce6e7e84 100644
--- a/.storybook/styles.scss
+++ b/.storybook/styles.scss
@@ -3,6 +3,13 @@
@use '../stylesheets/variables';
+#storybook-root {
+ height: 100%;
+}
+#storybook-root > div {
+ height: 100%;
+}
+
.container {
align-content: stretch;
align-items: stretch;
diff --git a/ACKNOWLEDGMENTS.md b/ACKNOWLEDGMENTS.md
index 37114991ba..f5e5fcdb1b 100644
--- a/ACKNOWLEDGMENTS.md
+++ b/ACKNOWLEDGMENTS.md
@@ -174,6 +174,210 @@ Signal Desktop makes use of the following open source projects.
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+## @internationalized/date
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright 2019 Adobe
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
## @popperjs/core
The MIT License (MIT)
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index a30a5b0113..92785dd6a5 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -7116,6 +7116,334 @@
"messageformat": "Notification content",
"description": "Label for the notification content setting select box"
},
+ "icu:NotificationProfile--moon-icon": {
+ "messageformat": "Moon icon",
+ "description": "Screenreader description for the moon icon used to signify notification profiles"
+ },
+ "icu:NotificationProfile--copy-label": {
+ "messageformat": "Copy of {profileName}",
+ "description": "Like 'Copy of Work.' When turning notification profiles sync back on, profile copies may be made if a given profile diverged on multiple devices."
+ },
+ "icu:NotificationProfile--am": {
+ "messageformat": "AM",
+ "description": "Text to be used for morning times in times; if your locale uses 24-hour time, this won't be used"
+ },
+ "icu:NotificationProfile--pm": {
+ "messageformat": "PM",
+ "description": "Text to be used for afternoon times in times; if your locale uses 24-hour time, this won't be used"
+ },
+ "icu:NotificationProfile--time-separator": {
+ "messageformat": ":",
+ "description": "The symbol used to separate hour and minutes in a time representation"
+ },
+ "icu:NotificationProfileMenuItem": {
+ "messageformat": "Notification profile",
+ "description": "Item in the main chats view 'more actions' menu allowing quick control of notification profiles"
+ },
+ "icu:NotificationProfileMenu--header": {
+ "messageformat": "Notification Profile",
+ "description": "Header for the popop meny to control notification profile overrides"
+ },
+ "icu:NotificationProfileMenu--on": {
+ "messageformat": "On",
+ "description": "Shown when a notification profile is enabled, but with no overrided end time"
+ },
+ "icu:NotificationProfileMenu--on-with-end": {
+ "messageformat": "On until {endTime}",
+ "description": "Shown when a notification profile is enabled, with an override that has an end time"
+ },
+ "icu:NotificationProfileMenu--for-one-hour": {
+ "messageformat": "For one hour",
+ "description": "Label for an item that will turn on a notification profile for one hour"
+ },
+ "icu:NotificationProfileMenu--until-time": {
+ "messageformat": "Until {time}",
+ "description": "Label for an item that will turn on a notification profile until a certain time"
+ },
+ "icu:NotificationProfileMenu--settings": {
+ "messageformat": "Settings",
+ "description": "Label for an item that will take the user to the Notification Profiles list in the preferences tab"
+ },
+ "icu:NotificationProfilesToast--enabled": {
+ "messageformat": "“{name}” on",
+ "description": "Shown in toast announcing that the named notification profile is now enabled"
+ },
+ "icu:NotificationProfilesToast--disabled": {
+ "messageformat": "“{name}” off",
+ "description": "Shown in toast announcing that the named notification profile is now disabled, and another has not replaced it as active"
+ },
+ "icu:NotificationProfilesToast--enabled--label": {
+ "messageformat": "Notification profile now enabled",
+ "description": "Shown in toast announcing that the named notification profile is now enabled"
+ },
+ "icu:NotificationProfilesToast--disabled--label": {
+ "messageformat": "Notification profile now disabled",
+ "description": "Shown in toast announcing that the named notification profile is now disabled, and another has not replaced it as active"
+ },
+ "icu:NotificationProfiles--setting": {
+ "messageformat": "Notification profiles",
+ "description": "Label for the notification profiles setting button"
+ },
+ "icu:NotificationProfiles--setup": {
+ "messageformat": "Set up",
+ "description": "Button text to setup notification profiles"
+ },
+ "icu:NotificationProfiles--title": {
+ "messageformat": "Notification Profiles",
+ "description": "Header text for notification profiles"
+ },
+ "icu:NotificationProfiles--setup-description": {
+ "messageformat": "Create a profile to receive notifications and calls only from the people and groups you choose",
+ "description": "Description text shown above create button when users have no notification profiles set up."
+ },
+ "icu:NotificationProfiles--setup-continue": {
+ "messageformat": "Continue",
+ "description": "Button on Notification Profile onboarding dialog, shown their first time on the profile list screen, if user has no profiles."
+ },
+ "icu:NotificationProfiles--manage-description": {
+ "messageformat": "Add or edit notification profiles",
+ "description": "Description text on the Notifications preferences page when the user already has profiles"
+ },
+ "icu:NotificationProfiles--manage-profiles": {
+ "messageformat": "{profileCount, plural, one {One profile} other {# profiles}}",
+ "description": "Button text to take user to profile list page when they already have notification profiles"
+ },
+ "icu:NotificationProfiles--create": {
+ "messageformat": "Create profile",
+ "description": "Button text to create a user's first notification profile"
+ },
+ "icu:NotificationProfiles--name-title": {
+ "messageformat": "Name your profile",
+ "description": "Title on page where users can type in a name for a notification profile."
+ },
+ "icu:NotificationProfiles--name-title--editing": {
+ "messageformat": "Name",
+ "description": "Title on page where user can edit the name/emoji for their notification profile."
+ },
+ "icu:NotificationProfiles--name-placeholder": {
+ "messageformat": "Profile name",
+ "description": "Placeholder text for notification profile name text input box"
+ },
+ "icu:NotificationProfiles--avatar-title": {
+ "messageformat": "Select an avatar",
+ "description": "Text shown above list of avatars that users can select for a notification profile"
+ },
+ "icu:NotificationProfiles--sample-name__work": {
+ "messageformat": "Work",
+ "description": "Sample notification profile name, shown next to a flexed biceps emoji"
+ },
+ "icu:NotificationProfiles--sample-name__sleep": {
+ "messageformat": "Sleep",
+ "description": "Sample notification profile name, shown next to a sleeping face emoji"
+ },
+ "icu:NotificationProfiles--sample-name__driving": {
+ "messageformat": "Driving",
+ "description": "Sample notification profile name, shown next to a car emoji"
+ },
+ "icu:NotificationProfiles--sample-name__downtime": {
+ "messageformat": "Downtime",
+ "description": "Sample notification profile name, shown next to a blushing smiley face emoji"
+ },
+ "icu:NotificationProfiles--sample-name__focus": {
+ "messageformat": "Focus",
+ "description": "Sample notification profile name, shown next to a lightbulb emoji"
+ },
+ "icu:NotificationProfiles--allowed-title": {
+ "messageformat": "Allowed notifications",
+ "description": "Header text above area where users select people or groups to include in the notification profile, who will still recevive nofications"
+ },
+ "icu:NotificationProfiles--allowed-modal-title": {
+ "messageformat": "Allowed Notifications",
+ "description": "Title text for modal where users select people or groups to include in the notification profile, who will still recevive nofications"
+ },
+ "icu:NotificationProfiles--allowed-description": {
+ "messageformat": "Add people and groups who you want notications from when this profile is on",
+ "description": "Description text for selecting people or groups that you still want to get notifications from when this profile is active"
+ },
+ "icu:NotificationProfiles--allowed-add-label": {
+ "messageformat": "Add people or groups",
+ "description": "Label text for a button to add people or groups to the allowed notification list"
+ },
+ "icu:NotificationProfiles--exceptions": {
+ "messageformat": "Exceptions",
+ "description": "Section header on text 'allowed notifications' screen, with checkboxes inside of it"
+ },
+ "icu:NotificationProfiles--exceptions--allow-all-calls": {
+ "messageformat": "Allow all calls",
+ "description": "Label text for a checkbox in the 'allowed notifications' page Exceptions section"
+ },
+ "icu:NotificationProfiles--exceptions--notify-for-mentions": {
+ "messageformat": "Notify for all mentions",
+ "description": "Label text for a checkbox in the 'allowed notifications' page Exceptions section"
+ },
+ "icu:NotificationProfiles--schedule-title": {
+ "messageformat": "Add a schedule",
+ "description": "Title of page where users can add a schedule for the profile to be active"
+ },
+ "icu:NotificationProfiles--schedule-title--editing": {
+ "messageformat": "Schedule",
+ "description": "Title of page where users change the schedule of their profile"
+ },
+ "icu:NotificationProfiles--schedule-description": {
+ "messageformat": "Enable and edit your schedule to automate your notification profile.",
+ "description": "More information about the schedule screen when creating a notification profile"
+ },
+ "icu:NotificationProfiles--schedule-enable": {
+ "messageformat": "Turn on automatically",
+ "description": "Label text for checkbox to enable / disable schedule"
+ },
+ "icu:NotificationProfiles--schedule": {
+ "messageformat": "Schedule",
+ "description": "Shown above area where users can edit a notification profile schedule"
+ },
+ "icu:NotificationProfiles--schedule-from": {
+ "messageformat": "From",
+ "description": "Label for dropdown to select time to start a notification profile schedule"
+ },
+ "icu:NotificationProfiles--schedule-until": {
+ "messageformat": "Until",
+ "description": "Label for dropdown to select time to end a notification profile schedule"
+ },
+ "icu:NotificationProfiles--open-time-picker": {
+ "messageformat": "Open time picker",
+ "description": "Label for button to open popup to make time choosing easier"
+ },
+ "icu:NotificationProfiles--schedule-sunday": {
+ "messageformat": "Sunday",
+ "description": "Label for the schedule checkbox for Sunday"
+ },
+ "icu:NotificationProfiles--schedule-monday": {
+ "messageformat": "Monday",
+ "description": "Label for the schedule checkbox for Monday"
+ },
+ "icu:NotificationProfiles--schedule-tuesday": {
+ "messageformat": "Tuesday",
+ "description": "Label for the schedule checkbox for Tuesday"
+ },
+ "icu:NotificationProfiles--schedule-wednesday": {
+ "messageformat": "Wednesday",
+ "description": "Label for the schedule checkbox for Wednesday"
+ },
+ "icu:NotificationProfiles--schedule-thursday": {
+ "messageformat": "Thursday",
+ "description": "Label for the schedule checkbox for Thursday"
+ },
+ "icu:NotificationProfiles--schedule-friday": {
+ "messageformat": "Friday",
+ "description": "Label for the schedule checkbox for Friday"
+ },
+ "icu:NotificationProfiles--schedule-saturday": {
+ "messageformat": "Saturday",
+ "description": "Label for the schedule checkbox for Saturday"
+ },
+ "icu:NotificationProfiles--done-title": {
+ "messageformat": "Profile Created",
+ "description": "Title text for the final screen in the notification profile creation flow"
+ },
+ "icu:NotificationProfiles--done-description": {
+ "messageformat": "If you’ve added a schedule, your profile will turn on and off automatically. You can also click the ··· icon at the top of the chat list to turn it on or off manually.",
+ "description": "Description for the final screen in the notification profile creation flow"
+ },
+ "icu:NotificationProfiles--schedule-sunday-short": {
+ "messageformat": "Sun",
+ "description": "Abbreviation for Sunday"
+ },
+ "icu:NotificationProfiles--schedule-monday-short": {
+ "messageformat": "Mon",
+ "description": "Abbreviation for Monday"
+ },
+ "icu:NotificationProfiles--schedule-tuesday-short": {
+ "messageformat": "Tue",
+ "description": "Abbreviation for Tuesday"
+ },
+ "icu:NotificationProfiles--schedule-wednesday-short": {
+ "messageformat": "Wed",
+ "description": "Abbreviation for Wednesday"
+ },
+ "icu:NotificationProfiles--schedule-thursday-short": {
+ "messageformat": "Thu",
+ "description": "Abbreviation for Thursday"
+ },
+ "icu:NotificationProfiles--schedule-friday-short": {
+ "messageformat": "Fri",
+ "description": "Abbreviation for Friday"
+ },
+ "icu:NotificationProfiles--schedule-saturday-short": {
+ "messageformat": "Sat",
+ "description": "Abbreviation for Saturday"
+ },
+ "icu:NotificationProfiles--schedule-weekdays": {
+ "messageformat": "Weekdays",
+ "description": "Shown when someone has selected all of the weekdays for a notification profile schedule"
+ },
+ "icu:NotificationProfiles--schedule-weekends": {
+ "messageformat": "Weekends",
+ "description": "Shown when someone has selected only weekend days for a notification profile schedule"
+ },
+ "icu:NotificationProfiles--schedule-daily": {
+ "messageformat": "Daily",
+ "description": "Shown when someone has selected every day for a notification profile schedule"
+ },
+ "icu:NotificationProfiles--schedule-separator": {
+ "messageformat": ", ",
+ "description": "Shown when user chose something other than weekdays/weekends/daily for a notification profile schedule. Short versions of all days chosen are shown, separated by this character. Like 'Mon, Thu, Fri'"
+ },
+ "icu:NotificationProfiles--list--header": {
+ "messageformat": "Profiles",
+ "description": "Shown right above the list of notification profiles on the main list page"
+ },
+ "icu:NotificationProfiles--list--sync": {
+ "messageformat": "Sync across devices",
+ "description": "Shown below the notification profile list; label for checkbox which controls whether notification profile behavior is always the same across all devices"
+ },
+ "icu:NotificationProfiles--list--sync--description": {
+ "messageformat": "Your profiles will be synced across your devices. Turning on a profile for one device will turn it on for the the others.",
+ "description": "More details for the 'Sync across devices' setting"
+ },
+ "icu:NotificationProfiles--new": {
+ "messageformat": "New profile",
+ "description": "Button label text to create a new notification profile"
+ },
+ "icu:NotificationProfiles--delete": {
+ "messageformat": "Delete profile",
+ "description": "Button label text to delete a notification profile"
+ },
+ "icu:NotificationProfiles--delete-confirmation": {
+ "messageformat": "Permanently delete this notification profile?",
+ "description": "Text of notification profile delete confirmation modal"
+ },
+ "icu:NotificationProfiles--delete-button": {
+ "messageformat": "Delete",
+ "description": "Button label text in the delete confirmation modal"
+ },
+ "icu:NotificationProfiles--edit--is-active": {
+ "messageformat": "On",
+ "description": "Shorthand description for a notification profile that is currently active"
+ },
+ "icu:NotificationProfiles--edit--is-not-active": {
+ "messageformat": "Off",
+ "description": "Shorthand description for a notification profile that is NOT currently active"
+ },
+ "icu:NotificationProfiles--edit--edit-name-label": {
+ "messageformat": "Edit this profile's name",
+ "description": "Label for pen icon next to notification profile's name on the edit page"
+ },
+ "icu:NotificationProfiles--edit--allowed": {
+ "messageformat": "{allowedCount, plural, zero {No allowed notifications} one {One allowed notification} other {# allowed notifications}}",
+ "description": "Header on notification profile edit page, showing number of contacts and groups in the allowed list"
+ },
+ "icu:NotificationProfiles--edit--schedule-timing": {
+ "messageformat": "{startTime} to {endTime}",
+ "description": "A summary of a notification profile's schedule - times will be rendered like 9:00 AM to 5:00 PM"
+ },
+ "icu:NotificationProfiles--edit--schedule-enabled": {
+ "messageformat": "On",
+ "description": "Shorthand description for an enabled notification profile schedule"
+ },
+ "icu:NotificationProfiles--edit--schedule-disabled": {
+ "messageformat": "Off",
+ "description": "Shorthand description for a disabled notification profile schedule"
+ },
"icu:Preferences--blocked": {
"messageformat": "Blocked",
"description": "Label for blocked contacts setting"
diff --git a/images/notifications-moon.svg b/images/notifications-moon.svg
new file mode 100644
index 0000000000..f13c3a0d7b
--- /dev/null
+++ b/images/notifications-moon.svg
@@ -0,0 +1,3 @@
+
diff --git a/package.json b/package.json
index 8b35f59975..ad5b01ae3d 100644
--- a/package.json
+++ b/package.json
@@ -124,6 +124,7 @@
"@indutny/range-finder": "1.3.4",
"@indutny/simple-windows-notifications": "2.0.16",
"@indutny/sneequals": "4.0.0",
+ "@internationalized/date": "3.7.0",
"@popperjs/core": "2.11.8",
"@radix-ui/react-tooltip": "1.2.7",
"@react-aria/focus": "3.19.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d96dad40fc..dc3dd3a978 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -104,6 +104,9 @@ importers:
'@indutny/sneequals':
specifier: 4.0.0
version: 4.0.0
+ '@internationalized/date':
+ specifier: 3.7.0
+ version: 3.7.0
'@popperjs/core':
specifier: 2.11.8
version: 2.11.8
diff --git a/protos/SignalStorage.proto b/protos/SignalStorage.proto
index 1b2f37bb91..3dc7dc5209 100644
--- a/protos/SignalStorage.proto
+++ b/protos/SignalStorage.proto
@@ -300,6 +300,7 @@ message AccountRecord {
IAPSubscriberData backupSubscriberData = 41;
optional AvatarColor avatarColor = 42;
NotificationProfileManualOverride notificationProfileManualOverride = 44;
+ bool notificationProfileSyncDisabled = 45;
}
message StoryDistributionListRecord {
diff --git a/stylesheets/components/NotificationProfiles.scss b/stylesheets/components/NotificationProfiles.scss
new file mode 100644
index 0000000000..1dd0bea18a
--- /dev/null
+++ b/stylesheets/components/NotificationProfiles.scss
@@ -0,0 +1,22 @@
+// Copyright 2025 Signal Messenger, LLC
+// SPDX-License-Identifier: AGPL-3.0-only
+
+@use 'sass:map';
+
+@use '../mixins';
+@use '../variables';
+
+// These are needed to override Input styling
+.NotificationProfiles__NamePage__input {
+ margin-top: 6px;
+ margin-inline-start: 2px;
+}
+
+.NotificationProfiles__NamePage__container {
+ max-width: 328px;
+ margin-inline-start: auto;
+ margin-inline-end: auto;
+ width: 100%;
+ margin-bottom: 12px;
+ border-width: 1px;
+}
diff --git a/stylesheets/components/Preferences.scss b/stylesheets/components/Preferences.scss
index 1e05124145..399ff8a829 100644
--- a/stylesheets/components/Preferences.scss
+++ b/stylesheets/components/Preferences.scss
@@ -24,7 +24,9 @@ $secondary-text-color: light-dark(
display: flex;
overflow: hidden;
user-select: none;
- width: 100vw;
+ height: 100%;
+ width: 100%;
+ align-items: stretch;
@include mixins.light-theme {
background: variables.$color-white;
@@ -343,6 +345,7 @@ $secondary-text-color: light-dark(
width: 100%;
padding-top: 8px;
max-width: 750px;
+ position: relative;
&::-webkit-scrollbar-corner {
background: transparent;
@@ -1467,8 +1470,36 @@ $secondary-text-color: light-dark(
}
}
+.Preferences__EditChatFolderPage__SelectChatsDialog {
+ height: 60vw;
+
+ .module-conversation-list::-webkit-scrollbar-thumb {
+ border-color: light-dark(variables.$color-white, variables.$color-gray-80);
+ }
+}
+
+.Preferences__EditChatFolderPage__SelectChatsDialog__body {
+ flex-grow: 1;
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
+}
+
+.Preferences__EditChatFolderPage__SelectChatsDialog__body_inner {
+ display: flex;
+ flex-direction: column;
+ height: 100%;
+}
+
.Preferences__ReadonlySqlPlayground__Textarea {
&__input {
font-family: variables.$monospace;
}
}
+
+.TimePickerPopup {
+ ::-webkit-scrollbar {
+ width: 0px;
+ background: transparent;
+ }
+}
diff --git a/stylesheets/components/fun/FunEmoji.scss b/stylesheets/components/fun/FunEmoji.scss
index ea029fd5b0..1cc4bb43c7 100644
--- a/stylesheets/components/fun/FunEmoji.scss
+++ b/stylesheets/components/fun/FunEmoji.scss
@@ -50,6 +50,13 @@ $emoji-sprite-sheet-grid-item-count: 62;
vertical-align: baseline;
}
+.FunStaticEmoji--Size12 {
+ width: 12px;
+ height: 12px;
+ // Use 32px variant even on smaller sizes to avoid shipping the 16px sheet
+ @include emoji-sprite($sheet: 32, $margin: 1px, $scale: calc(12 / 32));
+}
+
.FunStaticEmoji--Size16 {
width: 16px;
height: 16px;
diff --git a/stylesheets/manifest.scss b/stylesheets/manifest.scss
index 91812b7c5a..4574cb5e6f 100644
--- a/stylesheets/manifest.scss
+++ b/stylesheets/manifest.scss
@@ -145,6 +145,7 @@
@use 'components/MyStories.scss';
@use 'components/NavSidebar.scss';
@use 'components/NavTabs.scss';
+@use 'components/NotificationProfiles.scss';
@use 'components/OutgoingGiftBadgeModal.scss';
@use 'components/PermissionsPopup.scss';
@use 'components/PlaybackButton.scss';
diff --git a/stylesheets/tailwind-config.css b/stylesheets/tailwind-config.css
index 061f88791a..a5e423a28a 100644
--- a/stylesheets/tailwind-config.css
+++ b/stylesheets/tailwind-config.css
@@ -54,6 +54,7 @@
--color-background-primary: light-dark(/* */ #FFFFFF /* */, /* */ #1A1A1A /* */);
--color-background-secondary: light-dark(/* */ #F6F6F6 /* */, /* */ #262626 /* */);
--color-background-overlay: light-dark(--alpha(#000000 / 20%), --alpha(#000000 / 40%));
+ --color-background-overlay-secondary: light-dark(--alpha(#000000 / 15%), --alpha(#FFFFFF / 15%));
/* Colors/Elevated Background */
--color-elevated-background-primary: light-dark(#FAFAFA, #2A2A2A);
@@ -145,6 +146,7 @@
--color-background-primary: light-dark(/* */ #FFFFFF /* */, /* */ #121212 /* */);
--color-background-secondary: light-dark(/* */ #F6F6F6 /* */, /* */ #1E1E1E /* */);
--color-background-overlay: light-dark(--alpha(#000000 / 40%), --alpha(#000000 / 60%));
+ --color-background-overlay-secondary: light-dark(--alpha(#000000 / 15%), --alpha(#FFFFFF / 15%));
/* Colors/Elevated Background */
--color-elevated-background-primary: light-dark(#FFFFFF, #222222);
@@ -310,6 +312,8 @@
@theme {
/* box-shadow */
--shadow-*: initial; /* reset defaults */
+ --shadow-legacy-outline:
+ 0 0 0 2px #2c6bed;
--shadow-elevation-0:
0 1px 2px 0 var(--color-shadow-elevation-1);
--shadow-elevation-1:
diff --git a/ts/Crypto.ts b/ts/Crypto.ts
index d6c6c317d0..b46552a529 100644
--- a/ts/Crypto.ts
+++ b/ts/Crypto.ts
@@ -19,6 +19,7 @@ import { Environment, getEnvironment } from './environment.js';
import { toWebSafeBase64 } from './util/webSafeBase64.js';
import type { AciString, PniString } from './types/ServiceId.js';
+import type { AvatarColorType } from './types/Colors.js';
const { sample } = lodash;
@@ -710,7 +711,7 @@ export function generateAvatarColor({
e164: string | undefined;
pni: PniString | undefined;
groupId: string | undefined;
-}): string {
+}): AvatarColorType {
const hashValue = getIdentifierHash({ aci, e164, pni, groupId });
if (hashValue == null) {
diff --git a/ts/axo/AxoDropdownMenu.tsx b/ts/axo/AxoDropdownMenu.tsx
index d661d8d9e2..1839654c40 100644
--- a/ts/axo/AxoDropdownMenu.tsx
+++ b/ts/axo/AxoDropdownMenu.tsx
@@ -57,13 +57,17 @@ export namespace AxoDropdownMenu {
* ---------------------------------
*/
- export type RootProps = AxoBaseMenu.MenuRootProps;
+ export type RootProps = AxoBaseMenu.MenuRootProps & {
+ open?: boolean;
+ defaultOpen?: boolean;
+ onOpenChange?: (open: boolean) => void;
+ };
/**
* Contains all the parts of a dropdown menu.
*/
export const Root: FC = memo(props => {
- return {props.children};
+ return {props.children};
});
Root.displayName = `${Namespace}.Root`;
@@ -121,7 +125,9 @@ export namespace AxoDropdownMenu {
* ---------------------------------
*/
- export type ItemProps = AxoBaseMenu.MenuItemProps;
+ export type ItemProps = AxoBaseMenu.MenuItemProps & {
+ customIcon?: React.ReactNode;
+ };
/**
* The component that contains the dropdown menu items.
@@ -145,6 +151,11 @@ export namespace AxoDropdownMenu {
)}
+ {props.customIcon && (
+
+ {props.customIcon}
+
+ )}
{props.children}
{props.keyboardShortcut && (
diff --git a/ts/axo/AxoSymbol.tsx b/ts/axo/AxoSymbol.tsx
index 4bbb613162..4877a32aef 100644
--- a/ts/axo/AxoSymbol.tsx
+++ b/ts/axo/AxoSymbol.tsx
@@ -65,15 +65,17 @@ export namespace AxoSymbol {
*/
export type IconName = AxoSymbolIconName;
- export type IconSize = 14 | 16 | 20 | 24;
+ export type IconSize = 12 | 14 | 16 | 20 | 24 | 48;
type IconSizeConfig = { size: number; fontSize: number };
const IconSizes: Record = {
+ 12: { size: 12, fontSize: 11 },
14: { size: 14, fontSize: 12 },
16: { size: 16, fontSize: 14 },
20: { size: 20, fontSize: 18 },
24: { size: 24, fontSize: 22 },
+ 48: { size: 48, fontSize: 44 },
};
export function _getAllIconSizes(): ReadonlyArray {
diff --git a/ts/background.ts b/ts/background.ts
index 3dbf1cc3da..09862ddfbd 100644
--- a/ts/background.ts
+++ b/ts/background.ts
@@ -48,7 +48,7 @@ import {
} from './services/expiringMessagesDeletion.js';
import {
initialize as initializeNotificationProfilesService,
- update as updateNotificationProfileService,
+ fastUpdate as updateNotificationProfileService,
} from './services/notificationProfilesService.js';
import { tapToViewMessagesDeletionService } from './services/tapToViewMessagesDeletionService.js';
import { senderCertificateService } from './services/senderCertificate.js';
diff --git a/ts/components/Button.tsx b/ts/components/Button.tsx
index d19e251969..7f3ff15709 100644
--- a/ts/components/Button.tsx
+++ b/ts/components/Button.tsx
@@ -48,6 +48,7 @@ export type PropsType = {
size?: ButtonSize;
style?: CSSProperties;
tabIndex?: number;
+ testId?: string;
theme?: Theme;
variant?: ButtonVariant;
'aria-disabled'?: boolean;
@@ -110,6 +111,7 @@ export const Button = React.forwardRef(
icon,
style,
tabIndex,
+ testId,
theme,
variant = ButtonVariant.Primary,
size = variant === ButtonVariant.Details
@@ -150,6 +152,7 @@ export const Button = React.forwardRef(
className,
className && discouraged ? `${className}--discouraged` : undefined
)}
+ data-testid={testId}
disabled={disabled}
onClick={onClick}
form={form}
diff --git a/ts/components/LeftPane.stories.tsx b/ts/components/LeftPane.stories.tsx
index fbd40baa90..17f699dbe1 100644
--- a/ts/components/LeftPane.stories.tsx
+++ b/ts/components/LeftPane.stories.tsx
@@ -192,6 +192,7 @@ const useProps = (overrideProps: OverridePropsType = {}): PropsType => {
usernameCorrupted: false,
usernameLinkCorrupted: false,
isUpdateDownloaded,
+ isNotificationProfileActive: false,
navTabsCollapsed: false,
setChallengeStatus: action('setChallengeStatus'),
@@ -237,6 +238,9 @@ const useProps = (overrideProps: OverridePropsType = {}): PropsType => {
{...props}
/>
),
+ renderNotificationProfilesMenu: ({ trigger }) => (
+