bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-14 15:33:55 +00:00
Code Issues Releases Wiki Activity

Merge branch 'main' into PM-7853-Clients-Hide-Send-from-navigation-when-user-is-subject-to-the-disable-Send-policy

Browse Source
This commit is contained in:
bmbitwarden
2025-12-11 19:20:39 -05:00
committed by GitHub
parent df77b075c9 81350d98df
commit fad0237cad
5 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/browser/src/platform/popup/view-cache/popup-router-cache.service.ts
View File

@@ -120,8 +120,8 @@ export class PopupRouterCacheService {
/**
* Navigate back in history
*/
async back() {
if (!BrowserPopupUtils.inPopup(window)) {
async back(updateCache = false) {
if (!updateCache && !BrowserPopupUtils.inPopup(window)) {
this.location.back();
return;
}

2
apps/browser/src/vault/popup/components/vault-v2/attachments/attachments-v2.component.ts
View File

@@ -51,6 +51,6 @@ export class AttachmentsV2Component {
/** Navigate the user back to the edit screen after uploading an attachment */
async navigateBack() {
await this.popupRouterCacheService.back();
await this.popupRouterCacheService.back(true);
}
}

43
libs/common/src/vault/icon/build-cipher-icon.spec.ts
View File

@@ -13,18 +13,19 @@ describe("buildCipherIcon", () => {
},
} as any as CipherView;
it.each([true, false])("handles android app URIs for showFavicon setting %s", (showFavicon) => {
setUri("androidapp://test.example");
// @TODO Uncomment once we have Android and iOS icons https://bitwarden.atlassian.net/browse/PM-29028
// it.each([true, false])("handles android app URIs for showFavicon setting %s", (showFavicon) => {
// setUri("androidapp://test.example");
const iconDetails = buildCipherIcon(iconServerUrl, cipher, showFavicon);
// const iconDetails = buildCipherIcon(iconServerUrl, cipher, showFavicon);
expect(iconDetails).toEqual({
icon: "bwi-android",
image: null,
fallbackImage: "",
imageEnabled: showFavicon,
});
});
// expect(iconDetails).toEqual({
// icon: "bwi-android",
// image: null,
// fallbackImage: "",
// imageEnabled: showFavicon,
// });
// });
it("does not mark as an android app if the protocol is not androidapp", () => {
// This weird URI points to test.androidapp with a default port and path of /.example
@@ -40,18 +41,18 @@ describe("buildCipherIcon", () => {
});
});
it.each([true, false])("handles ios app URIs for showFavicon setting %s", (showFavicon) => {
setUri("iosapp://test.example");
// @TODO Uncomment once we have Android and iOS icons https://bitwarden.atlassian.net/browse/PM-29028
// it.each([true, false])("handles ios app URIs for showFavicon setting %s", (showFavicon) => {
// setUri("iosapp://test.example");
const iconDetails = buildCipherIcon(iconServerUrl, cipher, showFavicon);
expect(iconDetails).toEqual({
icon: "bwi-apple",
image: null,
fallbackImage: "",
imageEnabled: showFavicon,
});
});
// const iconDetails = buildCipherIcon(iconServerUrl, cipher, showFavicon);
// expect(iconDetails).toEqual({
// icon: "bwi-apple",
// image: null,
// fallbackImage: "",
// imageEnabled: showFavicon,
// });
// });
it("does not mark as an ios app if the protocol is not iosapp", () => {
// This weird URI points to test.iosapp with a default port and path of /.example

6
libs/common/src/vault/icon/build-cipher-icon.ts
View File

@@ -49,10 +49,12 @@ export function buildCipherIcon(
let isWebsite = false;
if (hostnameUri.indexOf("androidapp://") === 0) {
icon = "bwi-android";
// @TODO Re-add once we have Android icon https://bitwarden.atlassian.net/browse/PM-29028
// icon = "bwi-android";
image = null;
} else if (hostnameUri.indexOf("iosapp://") === 0) {
icon = "bwi-apple";
// @TODO Re-add once we have iOS icon https://bitwarden.atlassian.net/browse/PM-29028
// icon = "bwi-apple";
image = null;
} else if (
showFavicon &&

2
libs/components/src/form-field/form-field.component.html
View File

@@ -83,7 +83,7 @@
<ng-container *ngTemplateOutlet="labelContent"></ng-container>
</label>
<div
class="tw-gap-1 tw-flex tw-min-h-[1.85rem] tw-border-0 tw-border-solid"
class="tw-gap-1 tw-flex tw-min-h-[1.85rem] tw-border-0 tw-border-solid tw-items-center"
[ngClass]="{
'tw-border-secondary-300/50 tw-border-b tw-pb-[2px]': !disableReadOnlyBorder,
'tw-border-transparent tw-pb-[3px]': disableReadOnlyBorder,