From 4c80e92ecc8f49f8efb0dcc570526537b025e552 Mon Sep 17 00:00:00 2001 From: M Date: Tue, 2 Aug 2022 15:11:46 +0100 Subject: [PATCH 1/2] Fix for formatting amount for any_pay_payment totalAmount. --- lib/anypay/any_pay_payment.dart | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/anypay/any_pay_payment.dart b/lib/anypay/any_pay_payment.dart index 295ee2dc4..a2aac1d07 100644 --- a/lib/anypay/any_pay_payment.dart +++ b/lib/anypay/any_pay_payment.dart @@ -1,8 +1,8 @@ import 'package:cake_wallet/anypay/any_pay_chain.dart'; -import 'package:cw_bitcoin/bitcoin_amount_format.dart'; -import 'package:cw_core/monero_amount_format.dart'; import 'package:flutter/foundation.dart'; import 'package:cake_wallet/anypay/any_pay_payment_instruction.dart'; +import 'package:cake_wallet/bitcoin/bitcoin.dart'; +import 'package:cake_wallet/monero/monero.dart'; class AnyPayPayment { AnyPayPayment({ @@ -45,11 +45,11 @@ class AnyPayPayment { .fold(0, (int outAcc, out) => outAcc + out.amount)); switch (chain) { case AnyPayChain.xmr: - return moneroAmountToString(amount: total); + return monero.formatterMoneroAmountToString(amount: total); case AnyPayChain.btc: - return bitcoinAmountToString(amount: total); + return bitcoin.formatterBitcoinAmountToString(amount: total); case AnyPayChain.ltc: - return bitcoinAmountToString(amount: total); + return bitcoin.formatterBitcoinAmountToString(amount: total); default: return null; } From 84cb0b704cadb16395d0fadb79f7461f40d65788 Mon Sep 17 00:00:00 2001 From: M Date: Thu, 4 Aug 2022 22:26:39 +0100 Subject: [PATCH 2/2] Fix for build openssl for ios. --- scripts/ios/build_openssl.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/ios/build_openssl.sh b/scripts/ios/build_openssl.sh index 128ba3a54..57a59500b 100755 --- a/scripts/ios/build_openssl.sh +++ b/scripts/ios/build_openssl.sh @@ -10,7 +10,8 @@ echo "============================ OpenSSL ============================" echo "Cloning Open SSL from - $OPEN_SSL_URL" git clone $OPEN_SSL_URL $OPEN_SSL_DIR_PATH cd $OPEN_SSL_DIR_PATH -./build-libssl.sh --version=1.1.1q --archs="x86_64 arm64 armv7s armv7" --targets="ios64-cross-arm64" --deprecated +./build-libssl.sh --version=1.1.1q --targets="ios-cross-arm64" --deprecated mv ${OPEN_SSL_DIR_PATH}/include/* $EXTERNAL_IOS_INCLUDE_DIR -mv ${OPEN_SSL_DIR_PATH}/lib/* $EXTERNAL_IOS_LIB_DIR \ No newline at end of file +mv ${OPEN_SSL_DIR_PATH}/lib/libcrypto-iOS.a ${EXTERNAL_IOS_LIB_DIR}/libcrypto.a +mv ${OPEN_SSL_DIR_PATH}/lib/libssl-iOS.a ${EXTERNAL_IOS_LIB_DIR}/libssl.a \ No newline at end of file