Merge pull request #205 from qubic/dev

chore(release): promote dev to staging

Author: sallymoc

.github/workflows/deploy.yml

@@ -9,9 +9,15 @@ on:
   pull_request:
     types:
       - closed
+    branches:
+      - dev
+      - staging
+      - main
 
 jobs:
   release-and-deploy:
+    # Only run on push events OR when PR is actually merged (not just closed)
+    if: github.event_name == 'push' || github.event.pull_request.merged == true
     runs-on: ubuntu-latest
     steps:
       - name: 🛎️ Checkout repository

dev-proxy.js

@@ -28,7 +28,7 @@ function createProxy(targetURL, port) {
             request({ url: targetURL + req.url, method: req.method, json: req.body, headers: {'Authorization': req.header('Authorization')} },
                 function (error, response, body) {
                     if (error) {
-                        console.error('error: ' + response.statusCode);
+                        console.error('error: ' + (response ? response.statusCode : error.message));
                     }
                 }).pipe(res);
         }

src/app/app.module.ts

@@ -90,6 +90,7 @@ import { HistoryComponent } from './qearn/history/history.component';
 import { MatPaginatorModule } from '@angular/material/paginator';
 import { MatButtonToggleModule } from '@angular/material/button-toggle';
 import { StakeInputComponent } from './qearn/components/input-amount/stake-input.component';
+import { AmountInputDirective } from './directives/amount-input.directive';
 import { UnlockInputDialogComponent } from './qearn/components/unlock-input-dialog/unlock-input-dialog.component';
 import { BalanceHiddenComponent } from './core/balance-hidden/balance-hidden.component';
 import { SeedDisplayPipe } from './pipes/seed-display.pipe';
@@ -110,6 +111,7 @@ export const httpInterceptorProviders = [{ provide: HTTP_INTERCEPTORS, useClass:
     QearnComponent,
     StakingComponent,
     StakeInputComponent,
+    AmountInputDirective,
     UnlockInputDialogComponent,
     HistoryComponent,
     LockComponent,

src/app/assets/assets.component.html

@@ -270,7 +270,10 @@ <h2>{{ t("assetsComponent.form.info") }}</h2>
               <div class="col">
                 <mat-form-field appearance="fill" class="full-width">
                   <mat-label>{{ t("assetsComponent.form.amount") }}</mat-label>
-                  <input matInput type="number" formControlName="amount">
+                  <input matInput
+                    appAmountInput
+                    maxlength="19"
+                    formControlName="amount">
                   <mat-error *ngIf="sendForm.controls['amount'].hasError('required')">
                     {{ t("assetsComponent.form.amount.error") }}
                   </mat-error>

src/app/assets/assets.component.ts

@@ -261,7 +261,6 @@ export class AssetsComponent implements OnInit, OnDestroy {
     }
   }
 
-
   refreshData(): void {
     this.loadAssets(true);
   }

src/app/balance/balance.component.html

@@ -47,7 +47,7 @@ <h1>{{ t("general.navigation.balance") }}</h1>
                     <mat-expansion-panel (opened)="panelOpenState.set(true)" (closed)="panelOpenState.set(false)">
                         <mat-expansion-panel-header>
                             <mat-panel-title>
-                                <qli-transfer-status [transaction]="transaction"></qli-transfer-status>
+                                <tx-status [transaction]="transaction" [lastArchivedTick]="(us.archiverLatestTick | async) ?? undefined"></tx-status>
                                 &nbsp;
                                 <span class="display-publicid disable-area">
                                     <a [href]="ExplorerUrlHelper.getAddressUrl(transaction.sourceId)"
@@ -60,7 +60,7 @@ <h1>{{ t("general.navigation.balance") }}</h1>
                                     {{ transaction.created | dateTime }}
                                 </span>
                                 <button
-                                    *ngIf="isOwnId(transaction.sourceId) && currentTick > transaction.targetTick && transaction.status !== 'Pending' && isRepeatableTransaction(transaction.destId, transaction.type)"
+                                    *ngIf="isOwnId(transaction.sourceId) && currentTick > transaction.targetTick && transaction.status !== 'Pending' && isRepeatableTransaction(transaction.destId, transaction.type, transaction.amount)"
                                     mat-icon-button matTooltip="{{ t('balanceComponent.repeatTransaction') }}"
                                     (click)="repeat(transaction)"><mat-icon>repeat</mat-icon></button>
                             </mat-panel-title>
@@ -236,12 +236,7 @@ <h1>{{ t("general.navigation.balance") }}</h1>
                 <mat-expansion-panel (opened)="panelOpenState.set(true)" (closed)="panelOpenState.set(false)">
                     <mat-expansion-panel-header>
                         <mat-panel-title>
-                            <span class="status-icon" *ngIf="+transaction.transactions[0].transaction.amount > 0">
-                                <mat-icon *ngIf="transaction.transactions[0].moneyFlew" style="color: yellowgreen;"
-                                    matTooltip="{{ t('balanceComponent.transactions.status.executed.tooltip') }}">done</mat-icon>
-                                <mat-icon *ngIf="!transaction.transactions[0].moneyFlew" style="color: red"
-                                    matTooltip="{{ t('balanceComponent.transactions.status.dismissed.tooltip') }}">clear</mat-icon>
-                            </span>
+                            <tx-status [archivedTx]="transaction.transactions[0]"></tx-status>
                             &nbsp;
                             <span class="display-publicid disable-area">
                                 <a [href]="ExplorerUrlHelper.getAddressUrl(transaction.transactions[0].transaction.sourceId)"
@@ -256,7 +251,7 @@ <h1>{{ t("general.navigation.balance") }}</h1>
                                 &nbsp;
                                 {{ transaction.transactions[0].timestamp | dateTime }}
                             </span>
-                            <button *ngIf="isOwnId(transaction.transactions[0].transaction.sourceId) && isRepeatableTransaction(transaction.transactions[0].transaction.destId, transaction.transactions[0].transaction.inputType)" mat-icon-button
+                            <button *ngIf="isOwnId(transaction.transactions[0].transaction.sourceId) && isRepeatableTransaction(transaction.transactions[0].transaction.destId, transaction.transactions[0].transaction.inputType, +transaction.transactions[0].transaction.amount)" mat-icon-button
                                 matTooltip="{{ t('balanceComponent.repeatTransaction') }}"
                                 (click)="repeatTransactionArchiver(transaction.transactions[0].transaction)"><mat-icon>repeat</mat-icon></button>
                         </mat-panel-title>
@@ -315,7 +310,7 @@ <h1>{{ t("general.navigation.balance") }}</h1>
                                         <span class="label">{{ t("balanceComponent.transaction.source") }}</span>
                                     </div>
                                     <div class="col-value disable-area">
-                                        <span class="value display-publicid"> <a
+                                        <span class="value"> <a
                                                 [href]="ExplorerUrlHelper.getAddressUrl(transaction.transactions[0].transaction.sourceId)"
                                                 target="_blank">
                                                 {{getAddressDisplayName(transaction.transactions[0].transaction.sourceId)}}
@@ -398,6 +393,33 @@ <h1>{{ t("general.navigation.balance") }}</h1>
                                         </span>
                                     </div>
                                 </div>
+                                <!-- SendMany transfers list (lazy loaded on expand) -->
+                                <ng-container *ngIf="isSendManyTransaction(transaction.transactions[0].transaction.destId, transaction.transactions[0].transaction.inputType)">
+                                    <ng-container *ngIf="getSendManyTransfer(transaction.transactions[0].transaction.txId) as transfers">
+                                        <div class="sendmany-list" *ngIf="isSendManyExpanded(transaction.transactions[0].transaction.txId)">
+                                            <div class="sendmany-header label">
+                                                {{ t("balanceComponent.transaction.transfersCount", { count: transfers.length }) }}
+                                            </div>
+                                            <div class="row sendmany-item" *ngFor="let transfer of transfers">
+                                                <span class="sendmany-dest value disable-area">
+                                                    <a [href]="ExplorerUrlHelper.getAddressUrl(transfer.destId)" target="_blank">{{ getAddressDisplayName(transfer.destId) }}</a>
+                                                    <mat-icon class="icon-color-link icon"
+                                                        matTooltip="{{ t('general.copy.tooltip') }}"
+                                                        [cdkCopyToClipboard]="transfer.destId">content_copy</mat-icon>
+                                                </span>
+                                                <span class="sendmany-amount secondary">
+                                                    {{ transfer.amount | number: '1.0-0' }}&nbsp;{{ t("general.currency") }}
+                                                </span>
+                                            </div>
+                                        </div>
+                                    </ng-container>
+                                    <div style="text-align: center;">
+                                        <button mat-button class="sendmany-toggle secondary" (click)="toggleSendManyExpanded(transaction)">
+                                            <mat-icon>{{ isSendManyExpanded(transaction.transactions[0].transaction.txId) ? 'expand_less' : 'expand_more' }}</mat-icon>
+                                            {{ isSendManyExpanded(transaction.transactions[0].transaction.txId) ? t("balanceComponent.transaction.hideTransfers") : t("balanceComponent.transaction.showTransfers") }}
+                                        </button>
+                                    </div>
+                                </ng-container>
                             </mat-card-content>
                         </mat-card>
                     </div>

src/app/balance/balance.component.scss

@@ -1,6 +1,5 @@
 @import "../../vars.scss";
 
-
 .full-width {
     width: 100%;
 }
@@ -9,22 +8,15 @@
     display: flex;
     justify-content: center;
     align-items: center;
-    padding: 20px 0px 20px 0px;
+    padding: 20px 0;
 }
 
 .eye {
     display: flex;
     justify-content: flex-end;
     align-items: center;
-
-    .eye-icon {
-        cursor: pointer;
-        margin-left: 10px;
-    }
 }
 
-
-
 .transaction-list-compact {
     display: flex;
     flex-direction: row;
@@ -33,20 +25,8 @@
     align-items: center;
     column-gap: 10px;
 
-    .col-title {
-        // font-weight: bold;
-        min-width: 180px;
-        display: flex;
-    }
-
-    .copy {
-        width: inherit;
-        font-family: "Space Mono";
-    }
-
-
     .responsive-card {
-        margin-bottom: 0px;
+        margin-bottom: 0;
     }
 
     .row {
@@ -80,6 +60,10 @@
             align-items: flex-start;
         }
 
+        .col-value {
+            text-align: left;
+        }
+
         .value {
             text-align: left;
             margin-top: 4px;
@@ -99,13 +83,8 @@
     .send {
         color: red;
     }
-
-    .trans-date {
-        font-size: 0.9em;
-    }
 }
 
-
 .mat-accordion .mat-expansion-panel:first-of-type {
     margin-bottom: 10px;
 }
@@ -119,12 +98,10 @@
 
 .mat-expansion-panel-header-description {
     text-align: right;
-    // font-family: "Space Mono";
     flex-grow: initial;
     margin-right: 1px;
 }
 
-
 mat-card {
     width: 100%;
 }
@@ -137,7 +114,6 @@ mat-card {
     padding: 15px;
 }
 
-
 .icon-color-link {
     color: var(--mat-expansion-header-description-color);
 }
@@ -148,7 +124,6 @@ mat-card {
 
 .icon {
     transform: scale(0.8);
-    /* Optional: Adjust the vertical alignment if needed */
     vertical-align: middle;
     cursor: pointer;
 }
@@ -201,17 +176,11 @@ mat-card {
     }
 }
 
-
 .ticks {
     font-size: 1.2em;
     color: grey;
 }
 
-.status-icon {
-    padding-left: 6px;
-    padding-right: 2px;
-}
-
 .alert-wrapper {
     padding: 0 16px;
     margin-bottom: 16px;
@@ -287,4 +256,12 @@ mat-card {
     .address-name-full {
         display: inline;
     }
-}
+}
+
+.sendmany-list { display: flex; flex-direction: column; gap: 8px; background: rgba(255,255,255,.03); border-radius: 8px; padding: 12px; margin-top: 16px; margin-bottom: 12px; }
+.sendmany-header { margin-bottom: 0; padding-bottom: 8px; }
+.sendmany-item { margin-bottom: 0; }
+.sendmany-dest { word-break: break-all; flex: 1; min-width: 0; }
+.sendmany-amount { white-space: nowrap; text-align: right; }
+.sendmany-toggle { font-size: 1em; }
+@media (max-width: 600px) { .sendmany-item { flex-direction: column; align-items: flex-start; } .sendmany-amount { text-align: left; margin-top: 4px; } }