+ Address:
- {{ clipboardItem.address }}
+ Wallet:
@@ -35,11 +35,11 @@
} @else if (isPaymentClipboardItem(clipboardItem)) {
Value:
- {{ clipboardItem.value }}
+
-
Merchant:
- {{ clipboardItem.merchant }}
+ Platform:
+ {{ clipboardItem.platform }}
Description:
@@ -51,7 +51,7 @@
} @else if (isBolt11ClipboardItem(clipboardItem)) {
Value:
- Amount:
@@ -68,7 +68,7 @@
{{ clipboardItem.expiry }}
{{ clipboardItem.value }}
+ No Bitcoin/Nostr content detected.
diff --git a/src/app/features/clipboard/clipboard-details/clipboard-details.component.ts b/src/app/features/clipboard/clipboard-details/clipboard-details.component.ts
index 7346621..6446b81 100644
--- a/src/app/features/clipboard/clipboard-details/clipboard-details.component.ts
+++ b/src/app/features/clipboard/clipboard-details/clipboard-details.component.ts
@@ -16,6 +16,6 @@ export class ClipboardDetailsComponent extends BaseClipboardComponent {
@Input() clipboardItem: ClipboardItem | null;
onShareFeedback(): void {
- window.electron.openUrl('https://branta.pro/uses');
+ window.electron.openUrl('https://branta.pro');
}
}
diff --git a/src/app/features/clipboard/clipboard-history/clipboard-history.component.html b/src/app/features/clipboard/clipboard-history/clipboard-history.component.html
index 92f1045..03520a4 100644
--- a/src/app/features/clipboard/clipboard-history/clipboard-history.component.html
+++ b/src/app/features/clipboard/clipboard-history/clipboard-history.component.html
@@ -3,9 +3,9 @@
@for (item of history; track item) {
-
+
} @if (history.length == 0) {
-
-
@if (isAddressClipboardItem(item) && item.wallet) {
@@ -17,8 +17,8 @@
-
+ No wallet found.
} @else if (isPaymentClipboardItem(item)) {
-
} @else if (isBolt11ClipboardItem(item)) {
Merchant:
- {{ item.merchant }}
+ Platform:
+ {{ item.platform }}
@@ -27,9 +27,16 @@
}
+ @if (item.date) {
+
+
+ }
+
+
diff --git a/src/app/features/clipboard/clipboard-history/clipboard-history.component.scss b/src/app/features/clipboard/clipboard-history/clipboard-history.component.scss
index 1ed2e41..bf2d8c8 100644
--- a/src/app/features/clipboard/clipboard-history/clipboard-history.component.scss
+++ b/src/app/features/clipboard/clipboard-history/clipboard-history.component.scss
@@ -35,7 +35,7 @@
margin-bottom: 12px;
word-break: break-all;
- .details {
+ .details-container {
padding-bottom: 5px;
.text {
@@ -44,9 +44,27 @@
.details {
display: flex;
- align-items: center;
+ align-items: start;
gap: 10px;
color: $text-gray;
+
+ .type {
+ word-break: normal;
+ }
+ }
+ }
+
+ .right {
+ min-width: 100px;
+ flex-direction: column;
+ display: flex;
+ align-items: flex-end;
+ gap: 5px;
+ margin-right: 5px;
+
+ .date {
+ text-align: center;
+ color: $text-gray;
}
}
}
diff --git a/src/app/features/clipboard/clipboard-history/clipboard-history.component.ts b/src/app/features/clipboard/clipboard-history/clipboard-history.component.ts
index 54b1385..07e65f8 100644
--- a/src/app/features/clipboard/clipboard-history/clipboard-history.component.ts
+++ b/src/app/features/clipboard/clipboard-history/clipboard-history.component.ts
@@ -1,15 +1,16 @@
-import { CommonModule } from '@angular/common';
+import { CommonModule, DatePipe } from '@angular/common';
import { Component, Input } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MatIconModule } from '@angular/material/icon';
import { ExpandableTextComponent } from '../../../shared/components/expandable-text/expandable-text.component';
import { AddressClipboardItem, ClipboardItem, PaymentClipboardItem } from '../../../shared/models/clipboard-item';
-import { getIcon } from '../../../shared/models/wallet.model';
import { BaseClipboardComponent } from '../base-clipboard';
+import { MatTooltipModule } from '@angular/material/tooltip';
+import { DateAgoComponent } from '../../../shared/components/date-ago/date-ago.component';
@Component({
selector: 'app-clipboard-history',
- imports: [CommonModule, MatButtonModule, MatIconModule, ExpandableTextComponent],
+ imports: [CommonModule, MatButtonModule, MatIconModule, ExpandableTextComponent, DatePipe, DateAgoComponent, MatTooltipModule],
templateUrl: './clipboard-history.component.html',
styleUrl: './clipboard-history.component.scss'
})
diff --git a/src/app/features/settings/settings.component.html b/src/app/features/settings/settings.component.html
index 3ff5d51..cff4ce1 100644
--- a/src/app/features/settings/settings.component.html
+++ b/src/app/features/settings/settings.component.html
@@ -41,13 +41,23 @@
Show History
+
-
+
+ Rolloff Clipboard History
+
+ @for (rolloffType of ClipboardHistoryRolloffTypes; track rolloffType) {
+ {{ rolloffType }}
+ }
+
+
+
- ): ClipboardItem => {
+ return {
+ type: ClipboardItemType.Default,
+ private: false,
+ ...partial,
+ date: new Date()
+ } as ClipboardItem;
+};
+
+export const createAddressClipboardItem = (partial: Partial): AddressClipboardItem => {
+ return {
+ name: 'Bitcoin Address',
+ ...partial,
+ value: partial.address,
+ type: ClipboardItemType.Address,
+ private: false,
+ date: new Date()
+ } as AddressClipboardItem;
+};
+
+export const createBolt11ClipboardItem = (partial: Partial): Bolt11ClipboardItem => {
+ return {
+ ...partial,
+ name: 'Lightning Address',
+ type: ClipboardItemType.Bolt11,
+ private: false,
+ date: new Date()
+ } as Bolt11ClipboardItem;
+};
diff --git a/src/app/shared/models/icon.ts b/src/app/shared/models/icon.ts
index 1addb5e..983b550 100644
--- a/src/app/shared/models/icon.ts
+++ b/src/app/shared/models/icon.ts
@@ -1,13 +1,8 @@
export enum Icon {
Default = 0,
- Sparrow = 1,
- Bold = 2,
- Trezor = 3,
- Unchained = 4,
Purple = 5,
Teal = 6,
- Rust = 7,
- Blockstream = 8,
+ Rust = 7
}
export interface IconOption {
@@ -22,31 +17,6 @@ export var iconOptions: IconOption[] = [
icon: 'default.svg',
value: Icon.Default,
},
- {
- label: 'Sparrow',
- icon: 'sparrow.png',
- value: Icon.Sparrow,
- },
- {
- label: 'Bold',
- icon: 'bold.png',
- value: Icon.Bold
- },
- {
- label: 'Trezor',
- icon: 'trezor_white.svg',
- value: Icon.Trezor
- },
- {
- label: 'Unchained',
- icon: 'unchained.png',
- value: Icon.Unchained
- },
- {
- label: 'Blockstream',
- icon: 'blockstream.svg',
- value: Icon.Blockstream
- },
{
label: 'Purple',
icon: 'purple.svg',
diff --git a/src/app/shared/models/settings.ts b/src/app/shared/models/settings.ts
index 3d3b564..a4ed016 100644
--- a/src/app/shared/models/settings.ts
+++ b/src/app/shared/models/settings.ts
@@ -6,6 +6,13 @@ export interface Settings {
bitcoinUnitType: BitcoinUnitType;
}
+export enum ClipboardHistoryRolloffType {
+ Never = 'Never',
+ OneWeek = '1 week',
+ FourWeek = '4 weeks',
+ ThreeMonths = '3 months'
+}
+
export enum BitcoinUnitType {
Sats = 'Sats',
Bitcoin = 'Bitcoin',
@@ -14,6 +21,7 @@ export enum BitcoinUnitType {
export interface ClipboardHistory {
show: boolean;
+ rolloffType: ClipboardHistoryRolloffType;
}
export interface GeneralNotifications {
diff --git a/src/app/shared/pipes/date-ago.pipe.ts b/src/app/shared/pipes/date-ago.pipe.ts
new file mode 100644
index 0000000..54b1a34
--- /dev/null
+++ b/src/app/shared/pipes/date-ago.pipe.ts
@@ -0,0 +1,33 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+ name: 'dateAgo'
+})
+export class DateAgoPipe implements PipeTransform {
+ transform(value: any, date: Date): any {
+ if (!value) return value;
+
+ const seconds = Math.floor((+date - +new Date(value)) / 1000);
+
+ if (seconds < 29) return 'Just now';
+
+ const intervals = {
+ yr: 31536000,
+ mo: 2592000,
+ w: 604800,
+ d: 86400,
+ h: 3600,
+ m: 60,
+ s: 1
+ };
+ let counter;
+
+ for (const i in intervals) {
+ counter = Math.floor(seconds / intervals[i as keyof typeof intervals]);
+
+ if (counter > 0) {
+ return counter + i + ' ago';
+ }
+ }
+ }
+}
diff --git a/src/app/shared/services/base-clipboard.service.ts b/src/app/shared/services/base-clipboard.service.ts
index 044aae5..f0d0053 100644
--- a/src/app/shared/services/base-clipboard.service.ts
+++ b/src/app/shared/services/base-clipboard.service.ts
@@ -1,10 +1,17 @@
import { lastValueFrom } from 'rxjs';
-import { AddressClipboardItem, Bolt11ClipboardItem, ClipboardItem, PaymentClipboardItem } from '../models/clipboard-item';
-import { ExtendedKeyRegExp, NostrPubKeyRegExp, NostrPrivateKeyRegExp, LightningAddressRegExp, isBitcoinAddress } from './regex';
+import {
+ ClipboardItem,
+ ClipboardItemType,
+ PaymentClipboardItem,
+ createAddressClipboardItem,
+ createBolt11ClipboardItem,
+ createClipboardItem
+} from '../models/clipboard-item';
+import { Settings } from '../models/settings';
import { Vault } from '../models/vault.model';
-import { ServerService } from './server.service';
import { Wallet } from '../models/wallet.model';
-import { Settings } from '../models/settings';
+import { ExtendedKeyRegExp, LightningAddressRegExp, NostrPrivateKeyRegExp, NostrPubKeyRegExp, isBitcoinAddress } from './regex';
+import { ServerService } from './server.service';
export class BaseClipboardService {
public static async getClipboardItem(
@@ -20,14 +27,10 @@ export class BaseClipboardService {
await window.electron.showNotification('Bitcoin genesis block address copied.', 'We are all Satoshi');
}
- return {
+ return createAddressClipboardItem({
name: 'Bitcoin Address: Genesis Block',
- value: text,
- address: text,
- wallet: null,
- derivationPath: null,
- private: false
- } as AddressClipboardItem;
+ address: text
+ });
}
if (isBitcoinAddress(text)) {
@@ -58,7 +61,7 @@ export class BaseClipboardService {
if (paymentItem) {
if (notify) {
- await window.electron.showNotification(paymentItem.merchant, paymentItem.description ?? '');
+ await window.electron.showNotification(paymentItem.platform, paymentItem.description ?? '');
}
return paymentItem;
@@ -69,14 +72,9 @@ export class BaseClipboardService {
await window.electron.showNotification('New Bitcoin Address in Clipboard', 'Bitcoin Address Detected.');
}
- return {
- name: 'Bitcoin Address',
- value: text,
- address: text,
- wallet: null,
- derivationPath: null,
- private: false
- } as AddressClipboardItem;
+ return createAddressClipboardItem({
+ address: text
+ });
}
}
@@ -84,33 +82,36 @@ export class BaseClipboardService {
if (settings?.generalNotifications.bitcoinPublicKey && notify) {
await window.electron.showNotification('Bitcoin Extended Public Key in Clipboard.', 'Sharing can lead to loss of privacy.');
}
- return {
+
+ return createClipboardItem({
name: 'Extended Public Key',
value: text,
- private: false
- };
+ type: ClipboardItemType.PublicKey
+ });
}
if (NostrPubKeyRegExp.test(text)) {
if (settings?.generalNotifications.nostrPublicKey && notify) {
await window.electron.showNotification('Nostr Public Key in Clipboard.', text);
}
- return {
+
+ return createClipboardItem({
name: 'Nostr Public Key',
value: text,
- private: false
- };
+ type: ClipboardItemType.PublicKey
+ });
}
if (NostrPrivateKeyRegExp.test(text)) {
if (settings?.generalNotifications.nostrPrivateKey && notify) {
await window.electron.showNotification('Nostr Private Key in Clipboard.', 'Never share this.');
}
- return {
+
+ return createClipboardItem({
name: 'Nostr Private Key',
value: text,
- private: true
- };
+ type: ClipboardItemType.PrivateKey
+ });
}
if (LightningAddressRegExp.test(text)) {
@@ -125,7 +126,7 @@ export class BaseClipboardService {
if (paymentItem) {
if (settings?.generalNotifications.lightningAddress && notify) {
- await window.electron.showNotification(paymentItem.merchant, paymentItem.description ?? '');
+ await window.electron.showNotification(paymentItem.platform, paymentItem.description ?? '');
}
return paymentItem;
}
@@ -135,12 +136,10 @@ export class BaseClipboardService {
await window.electron.showNotification('Lightning Address in Clipboard', 'Lightning Address Detected.');
}
- return {
- name: 'Lightning Address',
+ return createBolt11ClipboardItem({
value: text,
- private: false,
...result
- } as Bolt11ClipboardItem;
+ });
}
return null;
@@ -148,10 +147,12 @@ export class BaseClipboardService {
private static async queryPayments(value: string, serverService: ServerService): Promise {
try {
- const paymentClipboardItem = await lastValueFrom(serverService.getPayment(value));
+ const paymentClipboardItems = await lastValueFrom(serverService.getPayment(value));
+
+ const paymentClipboardItem = paymentClipboardItems[0];
- paymentClipboardItem.name = paymentClipboardItem.merchant;
- paymentClipboardItem.value = paymentClipboardItem.payment;
+ paymentClipboardItem.name = paymentClipboardItem.platform;
+ paymentClipboardItem.value = value;
return paymentClipboardItem;
} catch (error) {
diff --git a/src/app/shared/services/clipboard.service.spec.ts b/src/app/shared/services/clipboard.service.spec.ts
index 475f623..a9605f8 100644
--- a/src/app/shared/services/clipboard.service.spec.ts
+++ b/src/app/shared/services/clipboard.service.spec.ts
@@ -1,12 +1,12 @@
+import { of } from 'rxjs';
+import { decodeLightningPayment } from '../../../../app/lib/lightning';
+import { verifyAddress } from '../../../../app/lib/verify-address';
+import { AddressClipboardItem, PaymentClipboardItem } from '../models/clipboard-item';
import { Settings } from '../models/settings';
-import { ServerService } from './server.service';
import { Vault } from '../models/vault.model';
import { PolicyType, Wallet } from '../models/wallet.model';
-import { AddressClipboardItem, PaymentClipboardItem } from '../models/clipboard-item';
-import { verifyAddress } from '../../../../app/lib/verify-address';
-import { decodeLightningPayment } from '../../../../app/lib/lightning';
-import { of } from 'rxjs';
import { BaseClipboardService } from './base-clipboard.service';
+import { ServerService } from './server.service';
const xpubs = ['xpub6Cbd89HtFkGQMk37HjxjpxB7zCysPUz2VzmSwGZPhH11vVaGZtbGw5pSyFe6Ff8qL8EASUL1WYaExqL2ULGwRd2RJkw3Yx8jU2CTNrZx65X'];
const npub = 'npub1d4ed5x49d7p24xn63flj4985dc4gpfngdhtqcxpth0ywhm6czxcscfpcq8';
@@ -20,8 +20,8 @@ var serverServiceMock = {
getPayment: (value: string) => {
if (['1HD1cVCJ5ZTgF6Tp7a7F92qqe3945NpKtu', lnbc[0]].includes(value)) {
return of({
- payment: 'Payment',
- merchant: 'Branta'
+ destinations: [{ value }],
+ platform: 'Branta'
} as PaymentClipboardItem);
}
@@ -143,11 +143,11 @@ describe('ClipboardService getClipboardItem', () => {
});
test.each([
- ['1HD1cVCJ5ZTgF6Tp7a7F92qqe3945NpKtu', true, true, 'Payment', 1],
- ['1HD1cVCJ5ZTgF6Tp7a7F92qqe3945NpKtu', false, true, undefined, 1],
- ['1HD1cVCJ5ZTgF6Tp7a7F92qqe3945NpKtu', true, false, 'Payment', 0],
- ['1HD1cVCJ5ZTgF6Txxxxxxxxxxxxxxxxxxz', true, true, undefined, 1]
- ])('Payment: %s', async (address: string, checkoutMode: boolean, notify: boolean, paymentValue: string | undefined, notificationCount: number) => {
+ ['1HD1cVCJ5ZTgF6Tp7a7F92qqe3945NpKtu', true, true, 1],
+ ['1HD1cVCJ5ZTgF6Tp7a7F92qqe3945NpKtu', false, true, 1],
+ ['1HD1cVCJ5ZTgF6Tp7a7F92qqe3945NpKtu', true, false, 0],
+ ['1HD1cVCJ5ZTgF6Txxxxxxxxxxxxxxxxxxz', true, true, 1]
+ ])('Payment: %s', async (address: string, checkoutMode: boolean, notify: boolean, notificationCount: number) => {
const showNotificationMock = jest.spyOn(window.electron, 'showNotification').mockResolvedValue();
var result = (await BaseClipboardService.getClipboardItem(
@@ -165,7 +165,7 @@ describe('ClipboardService getClipboardItem', () => {
)) as PaymentClipboardItem;
expect(showNotificationMock).toHaveBeenCalledTimes(notificationCount);
- expect(result?.payment).toBe(paymentValue);
+ expect(result?.value).toBe(address);
});
test.each([
@@ -226,9 +226,9 @@ describe('ClipboardService getClipboardItem', () => {
undefined,
0
],
- ['Lightning address on payment server should show default when checkout is off.', lnbc[0], false, true, true, undefined, 1],
- ['Lightning address on payment server should show payment when checkout is on.', lnbc[0], true, true, true, 'Payment', 1],
- ['Lightning address not on payment server should not show payment when checkout is on.', lnbc[1], true, true, true, undefined, 1]
+ ['Lightning address on payment server should show default when checkout is off.', lnbc[0], false, true, true, lnbc[0], 1],
+ ['Lightning address on payment server should show payment when checkout is on.', lnbc[0], true, true, true, lnbc[0], 1],
+ ['Lightning address not on payment server should not show payment when checkout is on.', lnbc[1], true, true, true, lnbc[1], 1]
])(
'Lightning: %s',
async (
@@ -257,7 +257,7 @@ describe('ClipboardService getClipboardItem', () => {
)) as PaymentClipboardItem;
expect(showNotificationMock).toHaveBeenCalledTimes(notificationCount);
- expect(result?.payment).toBe(paymentValue);
+ expect(result?.value).toBe(paymentValue);
}
);
});
diff --git a/src/app/shared/services/history.service.ts b/src/app/shared/services/history.service.ts
index c35bd3b..c6eeec2 100644
--- a/src/app/shared/services/history.service.ts
+++ b/src/app/shared/services/history.service.ts
@@ -1,7 +1,10 @@
-import { Injectable } from '@angular/core';
+import { effect, Injectable } from '@angular/core';
import { ReplaySubject } from 'rxjs';
import { ClipboardItem } from '../models/clipboard-item';
import { ClipboardService } from './clipboard.service';
+import { SettingsService } from './settings.service';
+import { ClipboardHistoryRolloffType } from '../models/settings';
+import { sub, subMonths, subWeeks } from 'date-fns';
@Injectable({
providedIn: 'root'
@@ -10,8 +13,19 @@ export class HistoryService {
private _history: ClipboardItem[] = [];
public history = new ReplaySubject();
- constructor(public clipboardService: ClipboardService) {
- this.load();
+ constructor(
+ public clipboardService: ClipboardService,
+ private settingsService: SettingsService
+ ) {
+ if (!this.settingsService.isLoading()) {
+ this.load();
+ } else {
+ effect(() => {
+ if (!this.settingsService.isLoading()) {
+ this.load();
+ }
+ });
+ }
this.clipboardService.clipboardItem.subscribe((item: ClipboardItem | null) => {
if (item && item.value && !item.private && item.value !== this._history[0]?.value) {
@@ -28,10 +42,41 @@ export class HistoryService {
}
private async load(): Promise {
- const history = await window.electron.retrieveData('history') as ClipboardItem[];
+ var history = (await window.electron.retrieveData('history')) as ClipboardItem[];
+
+ var isMissingDate = history.some((h) => h.date === undefined);
+
+ if (isMissingDate) {
+ history.forEach((h) => (h.date ??= new Date()));
+ }
+
+ var filterDate = this.getDateFilter();
+
+ if (filterDate) {
+ history = history.filter((h) => {
+ return new Date(h.date) >= filterDate!;
+ });
+ }
this._history = history;
- this.update();
+
+ this.save();
+ }
+
+ private getDateFilter(): Date | null {
+ const today = new Date();
+
+ switch (this.settingsService.settings().clipboardHistory.rolloffType) {
+ case ClipboardHistoryRolloffType.OneWeek:
+ return subWeeks(today, 1);
+ case ClipboardHistoryRolloffType.FourWeek:
+ return subWeeks(today, 4);
+ case ClipboardHistoryRolloffType.ThreeMonths:
+ return subMonths(today, 3);
+ case ClipboardHistoryRolloffType.Never:
+ default:
+ return null;
+ }
}
private async save() {
diff --git a/src/app/shared/services/server.service.ts b/src/app/shared/services/server.service.ts
index eb2ccd7..76f69ff 100644
--- a/src/app/shared/services/server.service.ts
+++ b/src/app/shared/services/server.service.ts
@@ -1,23 +1,30 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
-import { SettingsService } from './settings.service';
-import { PaymentClipboardItem } from '../models/clipboard-item';
import { Observable } from 'rxjs';
+import { environment } from '../../../environments/environment';
+import { PaymentClipboardItem } from '../models/clipboard-item';
+import { SettingsService } from './settings.service';
@Injectable({
providedIn: 'root'
})
export class ServerService {
+ constructor(
+ private settingsService: SettingsService,
+ private httpClient: HttpClient
+ ) {}
- constructor(private settingsService: SettingsService, private httpClient: HttpClient) { }
-
- getPayment(value: string): Observable {
- return this.httpClient.get(`${this.baseUrl}/payments/${encodeURIComponent(value)}`)
+ getPayment(value: string): Observable {
+ return this.httpClient.get(`${this.baseUrl}/v2/payments/${encodeURIComponent(value)}`);
}
private get baseUrl(): string {
- const subdomain = this.settingsService.settings().developerMode ? 'staging' : 'payments';
+ if (environment.production == false) {
+ return 'http://localhost:3000';
+ }
+
+ const subdomain = this.settingsService.settings().developerMode ? 'staging' : 'guardrail';
- return `https://${subdomain}.branta.pro/v1`;
+ return `https://${subdomain}.branta.pro/v2`;
}
}
diff --git a/src/app/shared/services/settings.service.ts b/src/app/shared/services/settings.service.ts
index afb75e8..81d1c29 100644
--- a/src/app/shared/services/settings.service.ts
+++ b/src/app/shared/services/settings.service.ts
@@ -1,5 +1,5 @@
import { computed, Injectable, signal } from '@angular/core';
-import { BitcoinUnitType, Settings } from '../models/settings';
+import { BitcoinUnitType, ClipboardHistoryRolloffType, Settings } from '../models/settings';
@Injectable({
providedIn: 'root'
@@ -10,7 +10,8 @@ export class SettingsService {
bitcoinUnitType: BitcoinUnitType.Sats,
developerMode: false,
clipboardHistory: {
- show: true
+ show: true,
+ rolloffType: ClipboardHistoryRolloffType.Never
},
generalNotifications: {
bitcoinAddress: true,
@@ -24,6 +25,8 @@ export class SettingsService {
#settings = signal(this.defaultSettings);
settings = computed(this.#settings);
+ isLoading = signal(true);
+
private readonly SETTINGS_KEY = 'settings';
constructor() {
@@ -35,6 +38,7 @@ export class SettingsService {
const parsedSettings: Partial = settings ? JSON.parse(settings) : {};
this.#settings.update(() => this.mergeSettings(this.defaultSettings, parsedSettings));
+ this.isLoading.update(() => false);
}
save(settings: Settings) {
diff --git a/src/assets/logo-white-all.svg b/src/assets/logo-white-all.svg
new file mode 100644
index 0000000..26312bb
--- /dev/null
+++ b/src/assets/logo-white-all.svg
@@ -0,0 +1,23 @@
+
+
\ No newline at end of file
diff --git a/src/assets/wallet/icon/blockstream.svg b/src/assets/wallet/icon/blockstream.svg
deleted file mode 100644
index 9d81938..0000000
--- a/src/assets/wallet/icon/blockstream.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
diff --git a/src/assets/wallet/icon/bold.png b/src/assets/wallet/icon/bold.png
deleted file mode 100644
index 991b9cc..0000000
Binary files a/src/assets/wallet/icon/bold.png and /dev/null differ
diff --git a/src/assets/wallet/icon/sparrow.png b/src/assets/wallet/icon/sparrow.png
deleted file mode 100644
index 9a64a86..0000000
Binary files a/src/assets/wallet/icon/sparrow.png and /dev/null differ
diff --git a/src/assets/wallet/icon/trezor.svg b/src/assets/wallet/icon/trezor.svg
deleted file mode 100644
index 40514ac..0000000
--- a/src/assets/wallet/icon/trezor.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/src/assets/wallet/icon/trezor_white.svg b/src/assets/wallet/icon/trezor_white.svg
deleted file mode 100644
index 668989e..0000000
--- a/src/assets/wallet/icon/trezor_white.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/src/assets/wallet/icon/unchained.png b/src/assets/wallet/icon/unchained.png
deleted file mode 100644
index 4b026e2..0000000
Binary files a/src/assets/wallet/icon/unchained.png and /dev/null differ
diff --git a/src/styles.scss b/src/styles.scss
index 9dd4a6b..4f0806b 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -9,13 +9,12 @@ $background: #1b1b1b;
$primary-color: #b49145;
$secondary-color: #466362;
-$success-color: #4AB15E;
-$warn-color: #BA3F1D;
+$success-color: #4ab15e;
+$warn-color: #ba3f1d;
$error-color: #b15e4a;
$text-gray: #bbbbbb;
-
html,
body {
height: 100%;
@@ -27,7 +26,6 @@ body {
font-family: 'Avenir', sans-serif;
}
-
@function create-palette($base-color) {
$hues: (
50: color.adjust($base-color, $lightness: 40%),
@@ -81,11 +79,14 @@ $custom-theme: mat.m2-define-dark-theme(
border-radius: 10px;
}
-
.address {
font-family: 'Roboto Mono', monospace;
}
+.text-primary {
+ color: $primary-color;
+}
+
::-webkit-scrollbar {
width: 8px;
background-color: transparent;
- Developer Mode
- help
+
diff --git a/src/app/features/settings/settings.component.ts b/src/app/features/settings/settings.component.ts
index 6113717..68e1b5a 100644
--- a/src/app/features/settings/settings.component.ts
+++ b/src/app/features/settings/settings.component.ts
@@ -3,15 +3,15 @@ import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatDialog } from '@angular/material/dialog';
import { MatIconModule } from '@angular/material/icon';
+import { MatInputModule } from '@angular/material/input';
+import { MatSelectModule } from '@angular/material/select';
import { MatSlideToggleModule } from '@angular/material/slide-toggle';
import { MatTooltipModule } from '@angular/material/tooltip';
import { ConfirmationDialogComponent } from '../../shared/components/confirmation-dialog/confirmation-dialog.component';
+import { BitcoinUnitType, ClipboardHistoryRolloffType } from '../../shared/models/settings';
import { ClipboardService } from '../../shared/services/clipboard.service';
import { HistoryService } from '../../shared/services/history.service';
import { SettingsService } from '../../shared/services/settings.service';
-import { MatSelectModule } from '@angular/material/select';
-import { BitcoinUnitType } from '../../shared/models/settings';
-import { MatInputModule } from '@angular/material/input';
@Component({
selector: 'app-settings',
@@ -22,11 +22,15 @@ import { MatInputModule } from '@angular/material/input';
export class SettingsComponent {
formGroup: FormGroup;
- checkoutModeTooltip = 'Verify BTC/LN checkouts & invoices. Requires internet.';
+ checkoutModeTooltip = 'Verify addresses by querying Branta with clipboard content. Requires internet.';
developerModeTooltip = "Only check this if you're a developer. Enables staging environment.";
BitcoinUnitTypes = Object.values(BitcoinUnitType);
+ ClipboardHistoryRolloffTypes = Object.values(ClipboardHistoryRolloffType);
+
+ private isCheckoutModeChange = false;
+
constructor(
private settingsService: SettingsService,
private historyService: HistoryService,
@@ -46,16 +50,22 @@ export class SettingsComponent {
lightningAddress: new FormControl(settings.generalNotifications.lightningAddress)
}),
clipboardHistory: new FormGroup({
- show: new FormControl(settings.clipboardHistory.show)
+ show: new FormControl(settings.clipboardHistory.show),
+ rolloffType: new FormControl(settings.clipboardHistory.rolloffType)
}),
developerMode: new FormControl(settings.developerMode)
});
this.formGroup.valueChanges.subscribe((settings) => {
- this.settingsService.save(settings);
+ if (!this.isCheckoutModeChange) {
+ this.settingsService.save(settings);
+ }
+
+ this.isCheckoutModeChange = false;
});
- this.formGroup.get('checkoutMode')?.valueChanges.subscribe(() => {
+ this.formGroup.get('checkoutMode')?.valueChanges.subscribe((value) => {
+ this.handleCheckoutModeChange(value);
this.clipboardService.rerunGetClipboardItem();
});
@@ -79,4 +89,30 @@ export class SettingsComponent {
}
});
}
+
+ private handleCheckoutModeChange(newValue: boolean): void {
+ if (!newValue) {
+ this.settingsService.save(this.formGroup.value);
+ return;
+ }
+
+ this.isCheckoutModeChange = true;
+
+ const dialogRef = this.dialog.open(ConfirmationDialogComponent, {
+ data: {
+ title: 'Turn Checkout Mode on?',
+ message: 'Are you sure you want to turn Checkout Mode on? This will query Branta with bitcoin addresses you copy.',
+ submitText: 'Confirm'
+ }
+ });
+
+ dialogRef.afterClosed().subscribe((confirmed) => {
+ if (confirmed) {
+ this.settingsService.save(this.formGroup.value);
+ this.clipboardService.rerunGetClipboardItem();
+ } else {
+ this.formGroup.get('checkoutMode')?.setValue(false, { emitEvent: false });
+ }
+ });
+ }
}
diff --git a/src/app/features/wallets/wallet-form/wallet-form.component.html b/src/app/features/wallets/wallet-form/wallet-form.component.html
index 402c5f8..222cd7b 100644
--- a/src/app/features/wallets/wallet-form/wallet-form.component.html
+++ b/src/app/features/wallets/wallet-form/wallet-form.component.html
@@ -99,12 +99,7 @@
+
+ Developer Mode
+ help
+
Confirm address 0:
@for (address of addresses; track address) {
-
-
+
- {{ address.prefix }}
- {{ address.remainder }}
-
- OR
diff --git a/src/app/features/wallets/wallet-form/wallet-form.component.scss b/src/app/features/wallets/wallet-form/wallet-form.component.scss
index 2b6ffd3..9a98ac5 100644
--- a/src/app/features/wallets/wallet-form/wallet-form.component.scss
+++ b/src/app/features/wallets/wallet-form/wallet-form.component.scss
@@ -29,6 +29,7 @@
margin-top: 10px;
display: flex;
flex-direction: column;
+ gap: 22px;
}
.wallet-form {
@@ -79,6 +80,7 @@
gap: 20px;
flex-direction: column;
overflow-y: auto;
+ font-size: 0.9rem;
.address {
.value {
@@ -116,8 +118,6 @@
::ng-deep .mat-mdc-tab-body-content {
.contents {
- margin-top: 15px;
-
.form-field {
width: 100%;
diff --git a/src/app/features/wallets/wallet-form/wallet-form.component.ts b/src/app/features/wallets/wallet-form/wallet-form.component.ts
index 0d59816..e830d02 100644
--- a/src/app/features/wallets/wallet-form/wallet-form.component.ts
+++ b/src/app/features/wallets/wallet-form/wallet-form.component.ts
@@ -10,6 +10,7 @@ import { MatStepperModule } from '@angular/material/stepper';
import { MatTabsModule } from '@angular/material/tabs';
import { ActivatedRoute, Router, RouterModule } from '@angular/router';
import { ConfirmationDialogComponent } from '../../../shared/components/confirmation-dialog/confirmation-dialog.component';
+import { ExpandableTextComponent } from '../../../shared/components/expandable-text/expandable-text.component';
import { CanComponentDeactivate } from '../../../shared/interfaces/can-deactivate.interface';
import { Address } from '../../../shared/models/address';
import { Icon, IconOption, iconOptions } from '../../../shared/models/icon';
@@ -37,7 +38,8 @@ interface AddressConfirmed {
MatSelectModule,
MatTabsModule,
MatStepperModule,
- MatCheckboxModule
+ MatCheckboxModule,
+ ExpandableTextComponent
],
templateUrl: './wallet-form.component.html',
styleUrl: './wallet-form.component.scss'
@@ -216,7 +218,7 @@ export class WalletFormComponent implements CanComponentDeactivate {
}
onShareFeedback(): void {
- window.electron.openUrl('https://branta.pro/uses');
+ window.electron.openUrl('https://branta.pro');
}
onIconSelectionChange(event: MatSelectChange) {
diff --git a/src/app/shared/components/date-ago/date-ago.component.ts b/src/app/shared/components/date-ago/date-ago.component.ts
new file mode 100644
index 0000000..ffaf7c4
--- /dev/null
+++ b/src/app/shared/components/date-ago/date-ago.component.ts
@@ -0,0 +1,29 @@
+import { ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core';
+import { DateAgoPipe } from '../../pipes/date-ago.pipe';
+
+@Component({
+ selector: 'app-date-ago',
+ imports: [DateAgoPipe],
+ template: `{{ value | dateAgo: currentTime }}`
+})
+export class DateAgoComponent implements OnInit, OnDestroy {
+ @Input() value: Date;
+ currentTime: Date = new Date();
+
+ private intervalId: any;
+
+ constructor(private cdr: ChangeDetectorRef) {}
+
+ ngOnInit(): void {
+ this.intervalId = setInterval(() => {
+ this.cdr.detectChanges();
+ this.currentTime = new Date();
+ }, 5000);
+ }
+
+ ngOnDestroy(): void {
+ if (this.intervalId) {
+ clearInterval(this.intervalId);
+ }
+ }
+}
diff --git a/src/app/shared/components/expandable-text/expandable-text.component.html b/src/app/shared/components/expandable-text/expandable-text.component.html
index 73e9850..850645c 100644
--- a/src/app/shared/components/expandable-text/expandable-text.component.html
+++ b/src/app/shared/components/expandable-text/expandable-text.component.html
@@ -1 +1,8 @@
-
+
diff --git a/src/app/shared/components/expandable-text/expandable-text.component.ts b/src/app/shared/components/expandable-text/expandable-text.component.ts
index cbb47c6..d14d8ce 100644
--- a/src/app/shared/components/expandable-text/expandable-text.component.ts
+++ b/src/app/shared/components/expandable-text/expandable-text.component.ts
@@ -1,19 +1,26 @@
+import { SlicePipe } from '@angular/common';
import { Component, Input, OnInit } from '@angular/core';
@Component({
selector: 'app-expandable-text',
- imports: [],
+ imports: [SlicePipe],
templateUrl: './expandable-text.component.html',
styleUrl: './expandable-text.component.scss'
})
export class ExpandableTextComponent implements OnInit {
@Input() text: string | null;
+ @Input() isAddress: boolean;
isLarge: boolean = false;
isExpanded: boolean = true;
LETTERS = 10;
+ prefixes = {
+ 4: ['lnbc', 'lntb', 'bc1q', 'bc1p', 'bcrt', 'tb1q', 'tb1p', 'ark1'],
+ 1: ['1', '3']
+ };
+
ngOnInit(): void {
if (this.text && this.text.length > 200) {
this.isLarge = true;
@@ -38,4 +45,23 @@ export class ExpandableTextComponent implements OnInit {
return this.text;
}
+
+ getPrefixLength(): number {
+ if (!this.text || this.text.trim() === '') {
+ return 0;
+ }
+
+ const sortedPrefixes = Object.entries(this.prefixes)
+ .map(([key, value]) => [parseInt(key), value] as [number, string[]])
+ .filter(([length]) => length <= this.text!.length)
+ .sort(([a], [b]) => a - b);
+
+ for (const [length, prefixList] of sortedPrefixes) {
+ if (prefixList.includes(this.text.substring(0, length))) {
+ return length;
+ }
+ }
+
+ return 0;
+ }
}
diff --git a/src/app/shared/models/clipboard-item.ts b/src/app/shared/models/clipboard-item.ts
index fd0870d..983582f 100644
--- a/src/app/shared/models/clipboard-item.ts
+++ b/src/app/shared/models/clipboard-item.ts
@@ -1,10 +1,21 @@
-import { Bolt11Details } from "./lightning";
-import { Wallet } from "./wallet.model";
+import { Bolt11Details } from './lightning';
+import { Wallet } from './wallet.model';
+
+export enum ClipboardItemType {
+ Default = 'Default',
+ Address = 'Address',
+ Payment = 'Payment',
+ Bolt11 = 'Bolt11',
+ PublicKey = 'Public Key',
+ PrivateKey = 'Private Key'
+}
export interface ClipboardItem {
name: string | null;
value: string | null;
private: boolean;
+ type: ClipboardItemType;
+ date: Date;
}
export interface AddressClipboardItem extends ClipboardItem {
@@ -13,11 +24,44 @@ export interface AddressClipboardItem extends ClipboardItem {
derivationPath: string | null;
}
+export interface PaymentDestination {
+ value: string;
+}
+
export interface PaymentClipboardItem extends ClipboardItem {
- payment: string;
- merchant: string;
+ destinations: PaymentDestination[];
+ platform: string;
description: string | null;
}
-export interface Bolt11ClipboardItem extends ClipboardItem, Bolt11Details {
-}
+export interface Bolt11ClipboardItem extends ClipboardItem, Bolt11Details {}
+
+export const createClipboardItem = (partial: Partial