Skip to content

fix(@desktop/privacy): Complete privacy mode , update colors and enable by default #19556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Khushboo-dev-cpp wants to merge 1 commit into
base: master
Choose a base branch
from
+100 −34
Draft

fix(@desktop/privacy): Complete privacy mode , update colors and enable by default #19556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app/global/feature_flags.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const DEFAULT_FLAG_SIMPLE_SEND_ENABLED = true
const DEFAULT_FLAG_MARKET_ENABLED = true
const DEFAULT_FLAG_HOMEPAGE_ENABLED = true
const DEFAULT_FLAG_LOCAL_BACKUP_ENABLED = true
const DEFAULT_FLAG_PRIVACY_MODE_FEATURE_ENABLED = false
const DEFAULT_FLAG_PRIVACY_MODE_FEATURE_ENABLED = true

# Compile time feature flags
const DEFAULT_FLAG_DAPPS_ENABLED = true
Expand Down
2 changes: 1 addition & 1 deletion storybook/pages/StatusNavBarTabButtonPage.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ SplitView {
SplitView.fillWidth: true
SplitView.fillHeight: true

color: thirdpartyServicesCtrl.checked ? Theme.palette.statusAppNavBar.backgroundColor: Theme.palette.privacyModeColors.navBarColor
color: thirdpartyServicesCtrl.checked ? Theme.palette.statusAppNavBar.backgroundColor: Theme.palette.privacyColors.primary

Column {
id: column
Expand Down
15 changes: 3 additions & 12 deletions ui/StatusQ/include/StatusQ/themepalette.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,23 +148,15 @@ class CustomisationColors {
camel, magenta, yinYang, purple2;
};

class PrivacyModeColors {
Q_GADGET
Q_PROPERTY(QColor navBarColor MEMBER navBarColor CONSTANT)
Q_PROPERTY(QColor navButtonColor MEMBER navButtonColor CONSTANT)
Q_PROPERTY(QColor navButtonHighlightedColor MEMBER navButtonHighlightedColor CONSTANT)
public:
QColor navBarColor, navButtonColor, navButtonHighlightedColor;
};

class PrivacyColors {
Q_GADGET
Q_PROPERTY(QColor primary MEMBER primary CONSTANT)
Q_PROPERTY(QColor secondary MEMBER secondary CONSTANT)
Q_PROPERTY(QColor tertiary MEMBER tertiary CONSTANT)
Q_PROPERTY(QColor tertiaryOpaque MEMBER tertiaryOpaque CONSTANT)
Q_PROPERTY(QColor iconColor MEMBER iconColor CONSTANT)
public:
QColor primary, secondary, tertiary, tertiaryOpaque;
QColor primary, secondary, tertiary, tertiaryOpaque, iconColor;
};

// Main ThemePalette class
Expand Down Expand Up @@ -288,7 +280,7 @@ class ThemePalette : public QObject {
Q_PROPERTY(StatusSelect statusSelect MEMBER statusSelect CONSTANT)
Q_PROPERTY(StatusMessage statusMessage MEMBER statusMessage CONSTANT)
Q_PROPERTY(CustomisationColors customisationColors MEMBER customisationColors CONSTANT)
Q_PROPERTY(PrivacyModeColors privacyModeColors MEMBER privacyModeColors CONSTANT)
Q_PROPERTY(PrivacyColors privacyColors MEMBER privacyColors CONSTANT)

public:
explicit ThemePalette(QObject* parent = nullptr);
Expand Down Expand Up @@ -346,7 +338,6 @@ class ThemePalette : public QObject {
StatusSelect statusSelect;
StatusMessage statusMessage;
CustomisationColors customisationColors;
PrivacyModeColors privacyModeColors;
PrivacyColors privacyColors;
};

Expand Down
4 changes: 2 additions & 2 deletions ui/StatusQ/src/StatusQ/Controls/StatusNavBarTabButton.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ StatusIconTabButton {
identicon.asset.color: (statusNavBarTabButton.hovered || highlighted || statusNavBarTabButton.checked) ?
statusNavBarTabButton.thirdpartyServicesEnabled ?
Theme.palette.primaryColor1 :
Theme.palette.privacyModeColors.navButtonHighlightedColor :
Theme.palette.privacyColors.tertiary :
statusNavBarTabButton.thirdpartyServicesEnabled ?
Theme.palette.baseColor1 :
Theme.palette.privacyModeColors.navButtonColor
Theme.palette.privacyColors.iconColor

StatusToolTip {
id: statusTooltip
Expand Down
2 changes: 1 addition & 1 deletion ui/StatusQ/src/StatusQ/Layout/StatusAppNavBar.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Rectangle {
implicitWidth: 78

color: root.thirdpartyServicesEnabled ? Theme.palette.statusAppNavBar.backgroundColor :
Theme.palette.privacyModeColors.navBarColor
Theme.palette.privacyColors.primary

QtObject {
id: d
Expand Down
Binary file modified ui/StatusQ/src/assets/png/browser/placeholders/browser-dark.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ui/StatusQ/src/assets/png/browser/placeholders/browser-light.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 13 additions & 9 deletions ui/StatusQ/src/themepalette.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,10 +212,12 @@ std::unique_ptr<ThemePalette> createDarkThemePalette(QObject* parent)
t->statusMessage.emojiReactionBackgroundHovered = t->primaryColor3;
t->statusMessage.emojiReactionBorderHovered = t->primaryColor2;

// Privacy mode colors
t->privacyModeColors.navBarColor = QColor(0x5A, 0x33, 0xCA);
t->privacyModeColors.navButtonColor = alpha(StatusColors::white, 0.4);
t->privacyModeColors.navButtonHighlightedColor = StatusColors::white;
// Privacy colors
t->privacyColors.primary = QColor(0x34, 0x1D, 0x65);
t->privacyColors.secondary = QColor(0x5B, 0x43, 0x8E);
t->privacyColors.tertiary = StatusColors::white;
t->privacyColors.tertiaryOpaque = alpha(StatusColors::white, 0.3);
t->privacyColors.iconColor = alpha(StatusColors::white, 0.5);

// Customisation colors
t->customisationColors.blue = QColor(0x22, 0x3B, 0xC4);
Expand Down Expand Up @@ -406,10 +408,12 @@ std::unique_ptr<ThemePalette> createLightThemePalette(QObject* parent)
t->statusMessage.emojiReactionBackgroundHovered = t->primaryColor2;
t->statusMessage.emojiReactionBorderHovered = t->primaryColor3;

// Privacy mode colors
t->privacyModeColors.navBarColor = QColor(0x5A, 0x33, 0xCA);
t->privacyModeColors.navButtonColor = alpha(StatusColors::white, 0.4);
t->privacyModeColors.navButtonHighlightedColor = StatusColors::white;
// Privacy colors
t->privacyColors.primary = QColor(0xBE, 0xBB, 0xF9);
t->privacyColors.secondary = QColor(0xD6, 0xD7, 0xF7);
t->privacyColors.tertiary = QColor(0x20, 0x1C, 0x76);
t->privacyColors.tertiaryOpaque = alpha(QColor(0x20, 0x1C, 0x76), 0.3);
t->privacyColors.iconColor = QColor(0x64, 0x70, 0x84);

// Customisation colors
t->customisationColors.blue = QColor(0x2A, 0x4A, 0xF5);
Expand Down Expand Up @@ -461,7 +465,7 @@ void registerThemePaletteType()
qmlRegisterUncreatableType<StatusSelect>("StatusQ.Core.Theme", 1, 0, "StatusSelect", "");
qmlRegisterUncreatableType<StatusMessage>("StatusQ.Core.Theme", 1, 0, "StatusMessage", "");
qmlRegisterUncreatableType<CustomisationColors>("StatusQ.Core.Theme", 1, 0, "CustomisationColors", "");
qmlRegisterUncreatableType<PrivacyModeColors>("StatusQ.Core.Theme", 1, 0, "PrivacyModeColors", "");
qmlRegisterUncreatableType<PrivacyColors>("StatusQ.Core.Theme", 1, 0, "PrivacyColors", "");

qmlRegisterUncreatableType<ThemePalette>("StatusQ.Core.Theme", 1, 0, "ThemePalette", "");
}
12 changes: 12 additions & 0 deletions ui/i18n/qml_base_en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17342,6 +17342,18 @@ access to your webcam</source>
<source>Enable third-party services</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Browser (browse web-pages, connect dApps)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Sync with NTP (Network Time Protocol) servers</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Missed messages if your device time isn’t synced to network time</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ThumbnailsDropdownContent</name>
Expand Down
15 changes: 15 additions & 0 deletions ui/i18n/qml_base_lokalise_en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21096,6 +21096,21 @@
<comment>ThirdpartyServicesPopup</comment>
<translation>Enable third-party services</translation>
</message>
<message>
<source>Browser (browse web-pages, connect dApps)</source>
<comment>ThirdpartyServicesPopup</comment>
<translation>Browser (browse web-pages, connect dApps)</translation>
</message>
<message>
<source>Sync with NTP (Network Time Protocol) servers</source>
<comment>ThirdpartyServicesPopup</comment>
<translation>Sync with NTP (Network Time Protocol) servers</translation>
</message>
<message>
<source>Missed messages if your device time isn’t synced to network time</source>
<comment>ThirdpartyServicesPopup</comment>
<translation>Missed messages if your device time isn’t synced to network time</translation>
</message>
</context>
<context>
<name>ThumbnailsDropdownContent</name>
Expand Down
12 changes: 12 additions & 0 deletions ui/i18n/qml_cs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17417,6 +17417,18 @@ access to your webcam</source>
<source>Enable third-party services</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Browser (browse web-pages, connect dApps)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Sync with NTP (Network Time Protocol) servers</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Missed messages if your device time isn’t synced to network time</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ThumbnailsDropdownContent</name>
Expand Down
12 changes: 12 additions & 0 deletions ui/i18n/qml_es.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17367,6 +17367,18 @@ acceso a tu cámara web</translation>
<source>Close</source>
<translation>Cerrar</translation>
</message>
<message>
<source>Browser (browse web-pages, connect dApps)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Sync with NTP (Network Time Protocol) servers</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Missed messages if your device time isn’t synced to network time</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ThumbnailsDropdownContent</name>
Expand Down
12 changes: 12 additions & 0 deletions ui/i18n/qml_ko.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17311,6 +17311,18 @@ access to your webcam</source>
<source>Enable services and restart the app</source>
<translation>서비스 활성화 및 앱 재시작</translation>
</message>
<message>
<source>Browser (browse web-pages, connect dApps)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Sync with NTP (Network Time Protocol) servers</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Missed messages if your device time isn’t synced to network time</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ThumbnailsDropdownContent</name>
Expand Down
15 changes: 10 additions & 5 deletions ui/imports/shared/panels/PrivacyWallCarousel.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Control {
function getImagePath(currentIndex) {
const imageName = root.model.get(currentIndex).image
const platformPostfix = isSmallPortraitScreen ? "-small": ""
const imagePath = "%1-%2%3".arg(imageName).arg(Theme.palette.name).arg(platformPostfix)
const imagePath = "%1-%2%3".arg(imageName).arg(root.Theme.palette.name).arg(platformPostfix)
return Assets.png(imagePath)
}
}
Expand Down Expand Up @@ -103,6 +103,7 @@ Control {

fillMode: Image.PreserveAspectFit
asynchronous: true
source: d.getImagePath(pageIndicator.currentIndex)

// cross-fade sequence
SequentialAnimation {
Expand All @@ -124,8 +125,12 @@ Control {
}

Component.onCompleted: {
placeholderImage.source = d.getImagePath(pageIndicator.currentIndex)
initialized = true
/* In case there is only one image in the list no animation
handling needed and default boinding will do the job */
if(pageIndicator.count > 1) {
placeholderImage.source = d.getImagePath(pageIndicator.currentIndex)
initialized = true
}
}
}

Expand Down Expand Up @@ -153,8 +158,8 @@ Control {
Layout.alignment: Qt.AlignHCenter

type: StatusBaseButton.Type.Primary
normalColor: Theme.palette.privacyModeColors.navBarColor
textColor: StatusColors.white
normalColor: Theme.palette.privacyColors.primary
textColor: Theme.palette.privacyColors.tertiary

text: qsTr("Enable third-party services")

Expand Down
7 changes: 5 additions & 2 deletions ui/imports/shared/popups/ThirdpartyServicesPopup.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,10 @@ StatusDialog {
model: ListModel {
ListElement { text: qsTr("Wallet (Swap, Send, Token data, etc.)") }
ListElement { text: qsTr("Market (Token data, prices, and news, etc.)") }
ListElement { text: qsTr("Browser (browse web-pages, connect dApps)") }
ListElement { text: qsTr("Token-gated communities and admin tools") }
ListElement { text: qsTr("Status news, etc.") }
ListElement { text: qsTr("Sync with NTP (Network Time Protocol) servers") }
}
}

Expand All @@ -83,6 +85,7 @@ StatusDialog {
model: ListModel {
ListElement { text: qsTr("Missing or invalid data") }
ListElement { text: qsTr("Errors and unexpected behavior") }
ListElement { text: qsTr("Missed messages if your device time isn’t synced to network time") }
}
}
}
Expand Down Expand Up @@ -124,8 +127,8 @@ StatusDialog {
rightButtons: ObjectModel {
StatusButton {
type: StatusBaseButton.Type.Primary
normalColor: Theme.palette.privacyModeColors.navBarColor
textColor: StatusColors.white
normalColor: Theme.palette.privacyColors.primary
textColor: Theme.palette.privacyColors.tertiary
text: {
if(root.thirdPartyServicesEnabled) {
if(root.isOnboardingFlow) {
Expand Down
2 changes: 1 addition & 1 deletion vendor/status-go
Open in desktop
Submodule status-go updated 40 files
+16 −3 _assets/scripts/migration_check.sh
+9 −4 _assets/scripts/run_functional_tests.sh
+0 −1 api/backend.go
+0 −35 api/backend_test.go
+0 −34 api/geth_backend.go
+1 −1 go.mod
+2 −2 go.sum
+1 −400 messaging/api.go
+87 −0 messaging/api_communities.go
+103 −0 messaging/api_filters.go
+62 −0 messaging/api_installations.go
+22 −0 messaging/api_metrics.go
+54 −0 messaging/api_processor.go
+9 −0 messaging/api_sender.go
+63 −0 messaging/api_store_nodes.go
+64 −0 messaging/api_transport_peers.go
+0 −18 messaging/core.go
+0 −25 mobile/status.go
+1 −1 nix/pkgs/status-go/library/default.nix
+0 −10 node/get_status_node.go
+11 −1 node/status_node_services.go
+0 −6 protocol/messenger.go
+3 −3 protocol/messenger_filter_init.go
+0 −10 protocol/messenger_mailserver.go
+0 −5 protocol/messenger_peers.go
+2 −3 protocol/messenger_raw_message_resend.go
+0 −4 services/ext/api.go
+0 −7 services/ext/service.go
+10 −2 services/wallet/thirdparty/activity/alchemy/client.go
+25 −0 services/wallet/thirdparty/activity/alchemy/types.go
+183 −0 services/wallet/thirdparty/activity/alchemy/types_test.go
+26 −0 tests-functional/clients/services/linkpreview.py
+2 −0 tests-functional/clients/status_backend.py
+24 −0 tests-functional/tests/test_link_preview.py
+41 −0 tools/metrics/README.md
+35 −0 tools/metrics/docker-compose.yml
+11 −0 tools/metrics/grafana/provisioning/dashboards/dashboards.yml
+1,599 −0 tools/metrics/grafana/provisioning/dashboards/status-go.json
+11 −0 tools/metrics/grafana/provisioning/datasources/prometheus.yml
+9 −0 tools/metrics/prometheus/prometheus.yml
Loading