From 3cfe2ec5322a3dd199b533dc4b28eb34320ce5d4 Mon Sep 17 00:00:00 2001
From: mkyq <53115730+mkyq@users.noreply.github.com>
Date: Fri, 29 Jul 2022 19:24:40 +0100
Subject: [PATCH] Fix/xmr anypay tx fix hide order (#447)

* Update build versions for Cake Wallet for ios and android.

* Add formatted crypto amount to xmr transaction for anypay transactions. Hide order id and payment id if they are not exists on payment status screen.

* Change build number for Cake Wallet ios and android.
---
 lib/ionia/ionia_anypay.dart                            |  1 +
 .../screens/ionia/cards/ionia_payment_status_page.dart | 10 ++++++----
 scripts/android/app_env.sh                             |  2 +-
 scripts/ios/app_env.sh                                 |  2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/ionia/ionia_anypay.dart b/lib/ionia/ionia_anypay.dart
index b9b53498a..a6527515a 100644
--- a/lib/ionia/ionia_anypay.dart
+++ b/lib/ionia/ionia_anypay.dart
@@ -46,6 +46,7 @@ class IoniaAnyPay {
 								isParsedAddress: false,
 								address: out.address,
 								cryptoAmount: moneroAmountToString(amount: out.amount),
+								formattedCryptoAmount: out.amount,
 								sendAll: false)).toList(),
 							priority: MoneroTransactionPriority.medium); // FIXME: HARDCODED PRIORITY
 					case AnyPayChain.btc:
diff --git a/lib/src/screens/ionia/cards/ionia_payment_status_page.dart b/lib/src/screens/ionia/cards/ionia_payment_status_page.dart
index d264842e6..0c2fc13df 100644
--- a/lib/src/screens/ionia/cards/ionia_payment_status_page.dart
+++ b/lib/src/screens/ionia/cards/ionia_payment_status_page.dart
@@ -104,10 +104,12 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage
                     .committedInfo
                     .transactions
                     .map((transaction) => buildDescriptionTileWithCopy(context, S.of(context).transaction_details_transaction_id, transaction.id)),
-                  Divider(height: 30),
-                  buildDescriptionTileWithCopy(context, S.of(context).order_id, widget.viewModel.paymentInfo.ioniaOrder.id),
-                  Divider(height: 30),
-                  buildDescriptionTileWithCopy(context, S.of(context).payment_id, widget.viewModel.paymentInfo.ioniaOrder.paymentId),
+                  if (widget.viewModel.paymentInfo.ioniaOrder.id != null)
+                    ...[Divider(height: 30),
+                    buildDescriptionTileWithCopy(context, S.of(context).order_id, widget.viewModel.paymentInfo.ioniaOrder.id)],
+                  if (widget.viewModel.paymentInfo.ioniaOrder.paymentId != null)
+                    ...[Divider(height: 30),
+                    buildDescriptionTileWithCopy(context, S.of(context).payment_id, widget.viewModel.paymentInfo.ioniaOrder.paymentId)],
                   ]))
                 ]),
           SizedBox(height: 40),
diff --git a/scripts/android/app_env.sh b/scripts/android/app_env.sh
index c5de5e175..12388b19d 100755
--- a/scripts/android/app_env.sh
+++ b/scripts/android/app_env.sh
@@ -21,7 +21,7 @@ MONERO_COM_PACKAGE="com.monero.app"
 
 CAKEWALLET_NAME="Cake Wallet"
 CAKEWALLET_VERSION="4.4.4"
-CAKEWALLET_BUILD_NUMBER=110
+CAKEWALLET_BUILD_NUMBER=111
 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 038217ece..ae9e41779 100755
--- a/scripts/ios/app_env.sh
+++ b/scripts/ios/app_env.sh
@@ -19,7 +19,7 @@ MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
 CAKEWALLET_VERSION="4.4.4"
-CAKEWALLET_BUILD_NUMBER=110
+CAKEWALLET_BUILD_NUMBER=111
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 HAVEN_NAME="Haven"