Merge pull request #275 from qubic/merge/main-into-dev

chore: merge main into dev (v4.26.2 hotfix)

Author: sallymoc

.github/workflows/commitlint.yml

@@ -29,11 +29,6 @@ jobs:
       - name: Install dependencies
         run: yarn install --frozen-lockfile
 
-      - name: Install commitlint
-        run: |
-          yarn add conventional-changelog-conventionalcommits
-          yarn add commitlint@20.5.3
-
       - name: Validate current commit (last commit) with commitlint
         if: github.event_name == 'push'
         run: npx commitlint --last --verbose

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [4.26.2](https://github.com/qubic/wallet/compare/v4.26.1...v4.26.2) (2026-06-17)
+
+
+### Bug Fixes
+
+* source QEarn current epoch from live tick-info instead of archiver last-processed tick ([70de123](https://github.com/qubic/wallet/commit/70de123ad9f4b111de5cad72080684f210f526b7))
+
 ## [4.26.1](https://github.com/qubic/wallet/compare/v4.26.0...v4.26.1) (2026-04-30)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "qubic-wallet",
-  "version": "4.26.1",
+  "version": "4.26.2",
   "main": "app.js",
   "author": "qubic",
   "description": "Qubic - Wallet - Send Qu's around the globe.",

src/app/qearn/qearn.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit, ViewChild, OnDestroy } from '@angular/core';
-import { ApiQueryService } from '../services/apis/query/api.query.service';
+import { ApiLiveService } from '../services/apis/live/api.live.service';
 import { WalletService } from '../services/wallet.service';
 import { QearnService } from '../services/qearn.service';
 import { PublicKey } from '@qubic-lib/qubic-ts-library/dist/qubic-types/PublicKey';
@@ -19,19 +19,19 @@ export class QearnComponent implements OnInit, OnDestroy {
   private unsubscribe$ = new Subject<void>();
 
   @ViewChild('tabGroup') tabGroup!: MatTabGroup;
-  constructor(public qearnService: QearnService, private walletService: WalletService, private apiQuery: ApiQueryService, private us: UpdaterService) {}
+  constructor(public qearnService: QearnService, private walletService: WalletService, private apiLiveService: ApiLiveService, private us: UpdaterService) {}
 
   async ngOnInit() {
     // Update the current balance
     this.us.loadCurrentBalance();
 
     // Fetching Lock Info and Stake Data
-    this.apiQuery
-      .getLastProcessedTick()
+    this.apiLiveService
+      .getTickInfo()
       .pipe(takeUntil(this.unsubscribe$))
       .subscribe(async (res) => {
         try {
-          this.epoch = res.epoch;
+          this.epoch = res.tickInfo.epoch;
           this.qearnService.epochInfo$.pipe(takeUntil(this.unsubscribe$)).subscribe((epochInfos) => {
             const epochInfo = epochInfos[this.epoch];
             this.currentLockedAmount = epochInfo?.currentLockedAmount || 0;

src/environments/environment.prod.ts

@@ -1,5 +1,5 @@
 export const environment = {
-  version: '4.26.1',
+  version: '4.26.2',
   production: true,
   apiUrl: 'https://rpc.qubic.org',
   staticApiUrl: 'https://static.qubic.org',

src/environments/environment.ts

@@ -1,5 +1,5 @@
 export const environment = {
-    version: '4.26.1',
+    version: '4.26.2',
     production: false,
     apiUrl: 'http://localhost:7004',
     staticApiUrl: 'https://static.qubic.org',