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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it really meant to be "ON" by default??? 🤯


# Compile time feature flags
const DEFAULT_FLAG_DAPPS_ENABLED = true
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.
30 changes: 24 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,29 @@
<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>
<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>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>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>
</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.
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.
20 changes: 18 additions & 2 deletions ui/imports/shared/panels/PrivacyWallCarousel.qml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,22 @@ Control {
signal openDiscussPageRequested()
signal enableThirdpartyServicesRequested()

QtObject {
id: d
readonly property var window: root.contentItem.Window.window
readonly property int windowWidth: window ? window.width: Screen.width
readonly property int windowHeight: window ? window.height: Screen.height
readonly property bool isSmallPortraitScreen: windowHeight > windowWidth
// The max width of a phone in portrait mode
&& windowWidth <= Theme.portraitBreakpoint.width
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)
return Theme.png(imagePath)
}
}

verticalPadding: Theme.xlPadding
horizontalPadding: Theme.xlPadding * 2

Expand Down Expand Up @@ -74,7 +90,7 @@ Control {
id: fadeSwap
OpacityAnimator { target: placeholderImage; from: 1; to: 0; duration: 500;}
PropertyAction { target: placeholderImage; property: "source";
value: Theme.png(root.model.get(pageIndicator.currentIndex).image) }
value: d.getImagePath(pageIndicator.currentIndex) }
OpacityAnimator { target: placeholderImage; from: 0; to: 1; duration: 500; }
}

Expand All @@ -89,7 +105,7 @@ Control {
}

Component.onCompleted: {
placeholderImage.source = Theme.png(root.model.get(pageIndicator.currentIndex).image)
placeholderImage.source = d.getImagePath(pageIndicator.currentIndex)
initialized = true
}
}
Expand Down