Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
33 changes: 33 additions & 0 deletions storybook/pages/BrowserPrivacyWallPage.qml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import QtQuick
import QtQuick.Controls

import AppLayouts.Browser

import Storybook

SplitView {
id: root

Logs { id: logs }

BrowserPrivacyWall {
SplitView.fillWidth: true
SplitView.fillHeight: true

onOpenThirdpartyServicesInfoPopupRequested: logs.logEvent("Enable third party services requested")
onOpenDiscussPageRequested: logs.logEvent("Open discuss page requested")
}

LogsAndControlsPanel {
id: logsAndControlsPanel

SplitView.minimumHeight: 100
SplitView.preferredHeight: 200

logsView.logText: logs.logText
}
}

// category: Layouts
// status: good
// https://www.figma.com/design/idUoxN7OIW2Jpp3PMJ1Rl8/Settings----Desktop-Legacy?node-id=27024-24709&m=dev
12 changes: 12 additions & 0 deletions ui/StatusQ/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,18 @@ if (${STATUSQ_SHADOW_BUILD})
src/assets/png/png.qrc
src/assets/twemoji/twemoji.qrc
src/assets/twemoji/twemoji-svg.qrc)

# Platform-specific PNG bundles
if(ANDROID OR IOS)
list(APPEND STATUSQ_QRC_FILES
src/assets/png/png-mobile.qrc
)
else()
list(APPEND STATUSQ_QRC_FILES
src/assets/png/png-desktop.qrc
)
endif()

if (${STATUSQ_STATIC_LIB})
# randlib would complain about the generated .o files. Generate cpp files instead.
qt_add_resources(STATUSQ_QRC_COMPILED ${STATUSQ_QRC_FILES})
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions ui/StatusQ/src/assets/png/png-desktop.qrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<RCC>
<qresource prefix="/assets/png">
<file>market/tradeCenter-light.png</file>
<file>market/swap-light.png</file>
<file>market/tradeCenter-dark.png</file>
<file>market/swap-dark.png</file>
<file>wallet/placeholders/buyView-dark.png</file>
<file>wallet/placeholders/collectiblesView-dark.png</file>
<file>wallet/placeholders/swapView-dark.png</file>
<file>wallet/placeholders/mainView-dark.png</file>
<file>wallet/placeholders/swapView-light.png</file>
<file>wallet/placeholders/mainView-light.png</file>
<file>wallet/placeholders/collectiblesView-light.png</file>
<file>wallet/placeholders/buyView-light.png</file>
<file>browser/placeholders/browser-light.png</file>
<file>browser/placeholders/browser-dark.png</file>
</qresource>
</RCC>
18 changes: 18 additions & 0 deletions ui/StatusQ/src/assets/png/png-mobile.qrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<RCC>
<qresource prefix="/assets/png">
<file>market/tradeCenter-light-small.png</file>
<file>market/swap-light-small.png</file>
<file>market/tradeCenter-dark-small.png</file>
<file>market/swap-dark-small.png</file>
<file>wallet/placeholders/mainView-light-small.png</file>
<file>wallet/placeholders/collectiblesView-light-small.png</file>
<file>wallet/placeholders/buyView-light-small.png</file>
<file>wallet/placeholders/swapView-light-small.png</file>
<file>wallet/placeholders/mainView-dark-small.png</file>
<file>wallet/placeholders/collectiblesView-dark-small.png</file>
<file>wallet/placeholders/buyView-dark-small.png</file>
<file>wallet/placeholders/swapView-dark-small.png</file>
<file>browser/placeholders/browser-light-small.png</file>
<file>browser/placeholders/browser-dark-small.png</file>
</qresource>
</RCC>
6 changes: 0 additions & 6 deletions ui/StatusQ/src/assets/png/png.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -924,11 +924,5 @@
<file>status-logo-icon.png</file>
<file>status-preparing.png</file>
<file>unfurling-image.png</file>
<file>wallet/placeholders/buyView.png</file>
<file>wallet/placeholders/swapView.png</file>
<file>wallet/placeholders/collectiblesView.png</file>
<file>wallet/placeholders/mainView.png</file>
<file>market/tradeCenter.png</file>
<file>market/swap.png</file>
</qresource>
</RCC>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions ui/StatusQ/src/typesregistration.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,11 @@ void registerStatusQTypes() {
Q_INIT_RESOURCE(fonts);
Q_INIT_RESOURCE(img);
Q_INIT_RESOURCE(png);
#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
Q_INIT_RESOURCE(png_mobile);
#else
Q_INIT_RESOURCE(png_desktop);
#endif
Q_INIT_RESOURCE(twemoji);
Q_INIT_RESOURCE(twemoji_svg);
#endif
Expand Down
31 changes: 31 additions & 0 deletions ui/app/AppLayouts/Browser/BrowserPrivacyWall.qml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import QtQuick
import QtQuick.Layouts

import StatusQ.Layout

import shared.panels
import utils

StatusSectionLayout {
id: root

signal openDiscussPageRequested()
signal openThirdpartyServicesInfoPopupRequested()

centerPanel: PrivacyWallCarousel {
Layout.fillWidth: true
Layout.fillHeight: true

infoText: qsTr("Enable third-party services for browser features to work.")
model: ListModel {
ListElement {
primary: qsTr("Dapp browser")
secondary: qsTr("Browse decentralized apps")
image: "browser/placeholders/browser"
}
}

onEnableThirdpartyServicesRequested: root.openThirdpartyServicesInfoPopupRequested()
onOpenDiscussPageRequested: root.openDiscussPageRequested()
}
}
1 change: 1 addition & 0 deletions ui/app/AppLayouts/Browser/qmldir
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
BrowserLayout 1.0 BrowserLayout.qml
BrowserPrivacyWall 1.0 BrowserPrivacyWall.qml
1 change: 1 addition & 0 deletions ui/app/AppLayouts/Onboarding/OnboardingFlow.qml
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@ OnboardingStackView {
NewAccountLoginPage {
networkChecksEnabled: root.networkChecksEnabled
isKeycardEnabled: root.isKeycardEnabled
thirdpartyServicesEnabled: root.thirdpartyServicesEnabled

onLoginWithSyncingRequested: root.push(logInBySyncingFlow)
onLoginWithKeycardRequested: root.push(loginWithKeycardFlow)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ OnboardingPage {
id: root

required property bool networkChecksEnabled
required property bool thirdpartyServicesEnabled

property bool isKeycardEnabled: true

Expand Down Expand Up @@ -126,7 +127,7 @@ OnboardingPage {

NetworkChecker {
id: netChecker
active: root.networkChecksEnabled
active: root.networkChecksEnabled && root.thirdpartyServicesEnabled
}

Component {
Expand Down
52 changes: 36 additions & 16 deletions ui/app/mainui/AppMain.qml
Original file line number Diff line number Diff line change
Expand Up @@ -2046,24 +2046,44 @@ Item {
restoreMode: Binding.RestoreNone
}

sourceComponent: BrowserLayout {
id: browserLayout
userUID: appMain.profileStore.pubKey
thirdpartyServicesEnabled: appMain.rootStore.thirdpartyServicesEnabled
navBar: appMain.navBar
bookmarksStore: BrowserStores.BookmarksStore {}
downloadsStore: BrowserStores.DownloadsStore {}
browserRootStore: BrowserStores.BrowserRootStore {}
browserWalletStore: BrowserStores.BrowserWalletStore {}
web3ProviderStore: BrowserStores.Web3ProviderStore {
dappBrowserAccountAddress: browserLayout.browserWalletStore.dappBrowserAccount.address
sourceComponent: appMain.rootStore.thirdpartyServicesEnabled ? browserLayout: browserPrivacyWall

Component {
id: browserPrivacyWall

BrowserPrivacyWall {
navBar: appMain.navBar

onOpenThirdpartyServicesInfoPopupRequested: popupRequestsHandler.thirdpartyServicesPopupHandler.openPopup()
onOpenDiscussPageRequested: Global.openLinkWithConfirmation(
Constants.statusDiscussPageUrl,
SQUtils.StringUtils.extractDomainFromLink(Constants.statusDiscussPageUrl))
}
}

transactionStore: appMain.transactionStore
assetsStore: appMain.walletAssetsStore
currencyStore: appMain.currencyStore
tokensStore: appMain.tokensStore
onSendToRecipientRequested: (address) => popupRequestsHandler.sendModalHandler.sendToRecipient(address)
Component {
id: browserLayout

BrowserLayout {
id: browserLayoutItem

userUID: appMain.profileStore.pubKey
thirdpartyServicesEnabled: appMain.rootStore.thirdpartyServicesEnabled
navBar: appMain.navBar
bookmarksStore: BrowserStores.BookmarksStore {}
downloadsStore: BrowserStores.DownloadsStore {}
browserRootStore: BrowserStores.BrowserRootStore {}
browserWalletStore: BrowserStores.BrowserWalletStore {}
web3ProviderStore: BrowserStores.Web3ProviderStore {
dappBrowserAccountAddress: browserLayoutItem.browserWalletStore.dappBrowserAccount.address
}

transactionStore: appMain.transactionStore
assetsStore: appMain.walletAssetsStore
currencyStore: appMain.currencyStore
tokensStore: appMain.tokensStore
onSendToRecipientRequested: (address) => popupRequestsHandler.sendModalHandler.sendToRecipient(address)
}
}
}

Expand Down
15 changes: 15 additions & 0 deletions ui/i18n/qml_base_en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2534,6 +2534,21 @@ Do you wish to override the security check and continue?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>BrowserPrivacyWall</name>
<message>
<source>Enable third-party services for browser features to work.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Dapp browser</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Browse decentralized apps</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>BrowserSettingsMenu</name>
<message>
Expand Down
18 changes: 18 additions & 0 deletions ui/i18n/qml_base_lokalise_en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3102,6 +3102,24 @@
<translation>If you wish so, you may continue with an unverified certificate. Accepting an unverified certificate means you may not be connected with the host you tried to connect to.&#xA;Do you wish to override the security check and continue?</translation>
</message>
</context>
<context>
<name>BrowserPrivacyWall</name>
<message>
<source>Enable third-party services for browser features to work.</source>
<comment>BrowserPrivacyWall</comment>
<translation>Enable third-party services for browser features to work.</translation>
</message>
<message>
<source>Dapp browser</source>
<comment>BrowserPrivacyWall</comment>
<translation>Dapp browser</translation>
</message>
<message>
<source>Browse decentralized apps</source>
<comment>BrowserPrivacyWall</comment>
<translation>Browse decentralized apps</translation>
</message>
</context>
<context>
<name>BrowserSettingsMenu</name>
<message>
Expand Down
15 changes: 15 additions & 0 deletions ui/i18n/qml_cs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2541,6 +2541,21 @@ Do you wish to override the security check and continue?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>BrowserPrivacyWall</name>
<message>
<source>Enable third-party services for browser features to work.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Dapp browser</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Browse decentralized apps</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>BrowserSettingsMenu</name>
<message>
Expand Down
15 changes: 15 additions & 0 deletions ui/i18n/qml_ko.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2527,6 +2527,21 @@ Do you wish to override the security check and continue?</source>
<translation>원하신다면, 검증되지 않은 인증서로 계속할 수 있습니다. 검증되지 않은 인증서를 수락하면, 시도한 호스트와 실제로 연결되지 않을 수 있습니다.\n보안 검사를 무시하고 계속하시겠습니까?</translation>
</message>
</context>
<context>
<name>BrowserPrivacyWall</name>
<message>
<source>Enable third-party services for browser features to work.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Dapp browser</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Browse decentralized apps</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>BrowserSettingsMenu</name>
<message>
Expand Down
Loading