Skip to content

Commit 6ed573e

Browse files
committed
Merge branch 'feat/acurast-multi-select' into 'develop'
feat(): acurast beacon select multiple acct See merge request papers/airgap/airgap-wallet!806
2 parents a65c606 + ca8c617 commit 6ed573e

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

src/app/pages/beacon-request/beacon-request.page.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ <h3>{{requesterName}}</h3>
9797
[requesterName]="requesterName"
9898
[inputs]="inputs"
9999
[network]="network"
100-
[targetProtocolSymbol]="'cACU'"
100+
[targetProtocolSymbol]="'acurast'"
101101
(walletSetEmitter)="setWallet($event)"
102102
></permission-request>
103103
</ng-container>

src/app/pages/beacon-request/beacon-request.page.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,8 @@ export class BeaconRequestPage implements OnInit {
270270

271271
type OmitBeaconMessageWrapper = Omit<BeaconMessageWrapper<SubstratePermissionResponse>, 'version' | 'senderId'>
272272

273+
localStorage.setItem(`beacon_acurast_selected_address:${request.senderId}`, this.selectedWallet.addresses[0])
274+
273275
const response: OmitBeaconMessageWrapper = {
274276
id: accountId,
275277
message: {
@@ -375,13 +377,17 @@ export class BeaconRequestPage implements OnInit {
375377
private async signRequestSubstrateV3(request: BeaconMessageWrapper<SubstrateSignPayloadRequest>): Promise<void> {
376378
const acurastProtocol: ICoinProtocolAdapter<AcurastProtocol> = await createV0AcurastProtocol()
377379

378-
const selectedWallet: AirGapMarketWallet = this.selectableWallets.find(
380+
let selectedWallet: AirGapMarketWallet = this.selectableWallets.find(
379381
(wallet: AirGapMarketWallet) => wallet.protocol.identifier === MainProtocolSymbols.ACURAST
380382
)
381383

382-
if (!selectedWallet) {
383-
// await this.beaconService.sendAccountNotFound(request)
384-
return
384+
const selectedAddress = localStorage.getItem(`beacon_acurast_selected_address:${request.senderId}`)
385+
386+
if (selectedAddress) {
387+
selectedWallet = this.selectableWallets.find(
388+
(wallet: AirGapMarketWallet) =>
389+
wallet.protocol.identifier === MainProtocolSymbols.ACURAST && wallet.addresses[0] === selectedAddress
390+
)
385391
}
386392

387393
const payload = request.message.blockchainData.payload as {

0 commit comments

Comments
 (0)