Skip to content
Merged
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
3 changes: 1 addition & 2 deletions ui/app/AppLayouts/Browser/panels/BrowserTabView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,7 @@ FocusScope {
tabBar.addItem(newTabButton);

if (createAsStartPage && root.thirdpartyServicesEnabled) {
// webview.url = "https://dap.ps" // TODO uncomment with https://github.com/status-im/status-desktop/issues/18545
webview.url = Constants.externalStatusLinkWithHttps
webview.url = Constants.browserDefaultHomepage
} else if (url !== undefined) {
webview.url = url;
} else if (localAccountSensitiveSettings.browserHomepage !== "") {
Expand Down
6 changes: 3 additions & 3 deletions ui/app/AppLayouts/Browser/popups/BrowserSettingsMenu.qml
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ StatusMenu {
StatusMenuItem {
id: clearSiteDataItem
text: qsTr("Clear site data")
icon.name: "broom"
icon.name: "delete"
icon.color: Theme.palette.primaryColor1
onTriggered: clearSiteData()

Expand All @@ -164,8 +164,8 @@ StatusMenu {
StatusMenuItem {
id: clearCacheItem
text: root.clearingCache ? qsTr("Clearing cache...") : qsTr("Clear cache")
icon.name: "refresh"
icon.color: Theme.palette.primaryColor1
icon.name: "broom"
icon.color: Theme.palette.primaryColor1
enabled: !root.clearingCache
onTriggered: clearCache()

Expand Down
7 changes: 6 additions & 1 deletion ui/app/AppLayouts/Browser/provider/qml/Utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ function extractDomainName(urlString) {
}
}

// Convert image://favicon/URL?query to direct URL
function normalizeFaviconUrl(url) {
return (url?.toString() ?? "").replace(/^image:\/\/favicon\/([^?]*).*/, "$1")
}

function validateDAppIcon(iconUrl, siteUrl) {
const iconStr = iconUrl ? iconUrl.toString() : ""
if (!iconStr || iconStr === "undefined") {
Expand All @@ -74,7 +79,7 @@ function validateDAppIcon(iconUrl, siteUrl) {
const siteDomain = extractDomainName(siteUrl)

if (faviconDomain.includes(siteDomain) || siteDomain.includes(faviconDomain)) {
return {valid: true, iconUrl: iconStr, reason: "match"}
return {valid: true, iconUrl: normalizeFaviconUrl(iconStr), reason: "match"}
}

return { valid: false, iconUrl: "", reason: "domain_mismatch" }
Expand Down
1 change: 1 addition & 0 deletions ui/imports/utils/Constants.qml
Original file line number Diff line number Diff line change
Expand Up @@ -1006,6 +1006,7 @@ QtObject {
readonly property string deepLinkPrefix: 'status-app://'
readonly property string externalStatusLink: 'status.app'
readonly property string externalStatusLinkWithHttps: 'https://' + externalStatusLink
readonly property string browserDefaultHomepage: 'https://hub.status.network/dashboard'
readonly property string communityLinkPrefix: externalStatusLinkWithHttps + '/c/'
readonly property string userLinkPrefix: externalStatusLinkWithHttps + '/u/'
readonly property string statusLinkPrefix: 'https://status.im/'
Expand Down