Release/0.9.0

app/main.ts

@@ -196,7 +196,7 @@ function createWindow() {
 
         if (!process.argv.includes('headless')) {
             mainWindow.show();
-            processUrl(mainWindow, process.argv);
+            // processUrl(mainWindow, process.argv);
         }
 
         kickoffClipboard();
@@ -229,7 +229,7 @@ const gotTheLock = app.requestSingleInstanceLock();
 if (process.platform == 'linux' ||
     process.platform === 'darwin') {
     app.on('open-url', (event, url) => {
-        processUrl(mainWindow, [url]);
+        // processUrl(mainWindow, [url]);
     });
 }
 
@@ -242,7 +242,7 @@ if (!gotTheLock) {
             if (mainWindow.isMinimized()) mainWindow.restore();
             mainWindow.show();
             mainWindow.focus();
-            processUrl(mainWindow, _commandLine);
+            // processUrl(mainWindow, _commandLine);
         }
     });
 

docs/local_development/Mac.MD → docs/Mac.MD

@@ -1,3 +1,12 @@
+### Building Release
+```
+rm -rf node_modules/
+rm -rf build/
+npm i
npm install --save-dev @electron-forge/maker-dmg electron-builder
+TEAM_ID=___ APPLE_ID_PASSWORD=______ APPLE_ID=________ npm run make
+```
+
+
 ### Running Locally: Mac
 
 ##### Starting the client & server:

forge.config.js

@@ -19,8 +19,8 @@ module.exports = {
         osxNotarize: {
             tool: 'notarytool',
             appleId: process.env.APPLE_ID,
-            appleIdPassword: process.env.APPLE_PASSWORD,
-            teamId: process.env.APPLE_TEAM_ID
+            appleIdPassword: process.env.APPLE_ID_PASSWORD,
+            teamId: process.env.TEAM_ID
         }
     },
     rebuildConfig: {},
@@ -45,7 +45,6 @@ module.exports = {
         {
             name: '@electron-forge/maker-dmg',
             config: {
-                background: './resources/dmg-background.jpg',
                 format: 'ULFO',
                 setupIcon: './resources/icon.icns'
             }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "branta",
   "productName": "Branta",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "main": "build/app/main.js",
   "author": "Branta LLC",
   "description": "Verify your bitcoin payments.",

src/app/app.component.scss

@@ -14,6 +14,10 @@
         img {
             height: 18px;
         }
+
+        &.darwin {
+            justify-content: flex-end;
+        }
     }
 
     .app {

src/app/app.config.ts

@@ -1,16 +1,17 @@
-import { provideHttpClient } from '@angular/common/http';
+import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { ApplicationConfig } from '@angular/core';
 import { provideAnimationsAsync } from '@angular/platform-browser/animations/async';
 import { provideRouter } from '@angular/router';
 import { provideToastr } from 'ngx-toastr';
 import { routes } from './app.routes';
 import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field';
+import { CaseConversionInterceptor } from './shared/interceptors/case-conversion.interceptor';
 
 export const appConfig: ApplicationConfig = {
     providers: [
         provideRouter(routes),
         provideAnimationsAsync(),
-        provideHttpClient(),
+        provideHttpClient(withInterceptorsFromDi()),
         provideToastr({
             positionClass: 'toast-bottom-right'
         }),
@@ -19,6 +20,11 @@ export const appConfig: ApplicationConfig = {
             useValue: {
                 subscriptSizing: 'dynamic'
             }
+        },
+        {
+            provide: HTTP_INTERCEPTORS,
+            useClass: CaseConversionInterceptor,
+            multi: true
         }
     ]
 };

src/app/features/clipboard/clipboard-details/clipboard-details.component.html

@@ -39,12 +39,17 @@
                 </div>
                 <div class="item">
                     <div class="title">Platform:</div>
-                    <div class="value">{{ clipboardItem.platform }}</div>
-                </div>
-                <div class="item">
-                    <div class="title">Description:</div>
-                    <div class="value">{{ clipboardItem.description }}</div>
+                    <div class="value flex-row">
+                      <img [src]="clipboardItem.platformLogoUrl" height="30" />
+                      <div>{{ clipboardItem.platform }}</div>
+                    </div>
                 </div>
+                @if (clipboardItem.description && clipboardItem.description.length > 0) {
+                  <div class="item">
+                      <div class="title">Description:</div>
+                      <div class="value">{{ clipboardItem.description }}</div>
+                  </div>
+                }
                 <div class="unexpected">
                     <button mat-button color="accent" (click)="onShareFeedback()">Unexpected?</button>
                 </div>

src/app/features/clipboard/clipboard-details/clipboard-details.component.scss

@@ -48,6 +48,12 @@
                         background: $warn-color;
                     }
                 }
+
+                &.flex-row {
+                    display: flex;
+                    flex-direction: row;
+                    align-items: center;
+                }
             }
         }
 

src/app/shared/interceptors/case-conversion.interceptor.ts

@@ -0,0 +1,32 @@
+import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest, HttpResponse } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+@Injectable()
+export class CaseConversionInterceptor implements HttpInterceptor {
+    intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
+        return next.handle(req).pipe(
+            map((event) => {
+                if (event instanceof HttpResponse && event.body) {
+                    return event.clone({ body: this.snakeToCamel(event.body) });
+                }
+                return event;
+            })
+        );
+    }
+
+    private snakeToCamel(obj: any): any {
+        if (obj instanceof Array) {
+            return obj.map((v) => this.snakeToCamel(v));
+        } else if (obj !== null && obj?.constructor === Object) {
+            return Object.keys(obj).reduce((result, key) => {
+                const camelKey = key.replace(/_([a-z])/g, (_, letter) => letter.toUpperCase());
+                result[camelKey] = this.snakeToCamel(obj[key]);
+                return result;
+            }, {} as any);
+        }
+
+        return obj;
+    }
+}

src/app/shared/models/clipboard-item.ts

@@ -32,6 +32,7 @@ export interface PaymentClipboardItem extends ClipboardItem {
     destinations: PaymentDestination[];
     platform: string;
     description: string | null;
+    platformLogoUrl: string;
 }
 
 export interface Bolt11ClipboardItem extends ClipboardItem, Bolt11Details {}

src/app/shared/services/clipboard.service.ts

@@ -1,7 +1,6 @@
 import { Injectable, NgZone } from '@angular/core';
 import { BehaviorSubject, ReplaySubject } from 'rxjs';
 import { ClipboardItem } from '../models/clipboard-item';
-import { Settings } from '../models/settings';
 import { Vault } from '../models/vault.model';
 import { Wallet } from '../models/wallet.model';
 import { ServerService } from './server.service';
@@ -51,7 +50,14 @@ export class ClipboardService extends BaseClipboardService {
 
     public async rerunGetClipboardItem(notify: boolean = false): Promise<void> {
         this.clipboardItem.next(
-            await ClipboardService.getClipboardItem(this._clipboardText, notify, this._vaults, this._wallets, this.settingsService.settings(), this.serverService)
+            await ClipboardService.getClipboardItem(
+                this._clipboardText.trim(),
+                notify,
+                this._vaults,
+                this._wallets,
+                this.settingsService.settings(),
+                this.serverService
+            )
         );
     }
 }

src/app/shared/services/server.service.ts

@@ -25,6 +25,6 @@ export class ServerService {
 
         const subdomain = this.settingsService.settings().developerMode ? 'staging' : 'guardrail';
 
-        return `https://${subdomain}.branta.pro/v2`;
+        return `https://${subdomain}.branta.pro`;
     }
 }