Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2025-01-09 20:39:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'moon_pay' into CW-492-moonpay

Browse source
This commit is contained in:
Omar Hatem 2023-11-29 16:21:02 +02:00 committed by GitHub
commit 905967405f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cw_monero/lib/monero_wallet_service.dart
View file

@ -273,6 +273,9 @@ class MoneroWalletService extends WalletService<
date: DateTime.fromMillisecondsSinceEpoch(polyseed.birthday * 1000)); date: DateTime.fromMillisecondsSinceEpoch(polyseed.birthday * 1000));
final spendKey = keyToHexString(polyseed.generateKey(coin, 32)); final spendKey = keyToHexString(polyseed.generateKey(coin, 32));
walletInfo.isRecovery = true;
walletInfo.restoreHeight = height;
await monero_wallet_manager.restoreFromSpendKey( await monero_wallet_manager.restoreFromSpendKey(
path: path, path: path,
password: password, password: password,

6
cw_nano/lib/nano_wallet.dart
View file

@ -186,9 +186,9 @@ abstract class NanoWalletBase
final block = await _client.constructSendBlock( final block = await _client.constructSendBlock(
amountRaw: amt.toString(), amountRaw: amt.toString(),
destinationAddress: credentials.outputs.first.isParsedAddress destinationAddress: txOut.isParsedAddress
? credentials.outputs.first.extractedAddress! ? txOut.extractedAddress!
: credentials.outputs.first.address, : txOut.address,
privateKey: _privateKey!, privateKey: _privateKey!,
balanceAfterTx: runningBalance, balanceAfterTx: runningBalance,
previousHash: previousHash, previousHash: previousHash,

3
lib/view_model/dashboard/nft_view_model.dart
View file

@ -4,6 +4,7 @@ import 'dart:developer';
import 'package:cake_wallet/core/wallet_connect/wc_bottom_sheet_service.dart'; import 'package:cake_wallet/core/wallet_connect/wc_bottom_sheet_service.dart';
import 'package:cake_wallet/src/screens/wallet_connect/widgets/message_display_widget.dart'; import 'package:cake_wallet/src/screens/wallet_connect/widgets/message_display_widget.dart';
import 'package:cw_core/wallet_type.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:mobx/mobx.dart'; import 'package:mobx/mobx.dart';
import 'package:cake_wallet/.secrets.g.dart' as secrets; import 'package:cake_wallet/.secrets.g.dart' as secrets;
@ -38,6 +39,8 @@ abstract class NFTViewModelBase with Store {
@action @action
Future<void> getNFTAssetByWallet() async { Future<void> getNFTAssetByWallet() async {
if (appStore.wallet!.type != WalletType.ethereum) return;
final walletAddress = appStore.wallet!.walletInfo.address; final walletAddress = appStore.wallet!.walletInfo.address;
log('Fetching wallet NFTs for $walletAddress'); log('Fetching wallet NFTs for $walletAddress');