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; } diff --git a/lib/ionia/ionia_api.dart b/lib/ionia/ionia_api.dart index 6784e2ba1..ca3eae03d 100644 --- a/lib/ionia/ionia_api.dart +++ b/lib/ionia/ionia_api.dart @@ -9,7 +9,7 @@ import 'package:cake_wallet/ionia/ionia_category.dart'; import 'package:cake_wallet/ionia/ionia_gift_card.dart'; class IoniaApi { - static const baseUri = 'apistaging.ionia.io'; + static const baseUri = 'api.ionia.io'; static const pathPrefix = 'cake'; static final createUserUri = Uri.https(baseUri, '/$pathPrefix/CreateUser'); static final verifyEmailUri = Uri.https(baseUri, '/$pathPrefix/VerifyEmail'); diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh index 12388b19d..3c0cb2abd 100755 --- a/scripts/android/app_env.sh +++ b/scripts/android/app_env.sh @@ -14,14 +14,14 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN) APP_ANDROID_TYPE=$1 MONERO_COM_NAME="Monero.com" -MONERO_COM_VERSION="1.0.7" -MONERO_COM_BUILD_NUMBER=14 +MONERO_COM_VERSION="1.0.8" +MONERO_COM_BUILD_NUMBER=15 MONERO_COM_BUNDLE_ID="com.monero.app" MONERO_COM_PACKAGE="com.monero.app" CAKEWALLET_NAME="Cake Wallet" CAKEWALLET_VERSION="4.4.4" -CAKEWALLET_BUILD_NUMBER=111 +CAKEWALLET_BUILD_NUMBER=112 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet" CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet" diff --git a/scripts/ios/app_env.sh b/scripts/ios/app_env.sh index ae9e41779..1c78d8044 100755 --- a/scripts/ios/app_env.sh +++ b/scripts/ios/app_env.sh @@ -13,13 +13,13 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN) APP_IOS_TYPE=$1 MONERO_COM_NAME="Monero.com" -MONERO_COM_VERSION="1.0.7" -MONERO_COM_BUILD_NUMBER=17 +MONERO_COM_VERSION="1.0.8" +MONERO_COM_BUILD_NUMBER=18 MONERO_COM_BUNDLE_ID="com.cakewallet.monero" CAKEWALLET_NAME="Cake Wallet" CAKEWALLET_VERSION="4.4.4" -CAKEWALLET_BUILD_NUMBER=111 +CAKEWALLET_BUILD_NUMBER=112 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet" HAVEN_NAME="Haven"