From 04d3b47cafd83a64dbc45761cece8138d3c95251 Mon Sep 17 00:00:00 2001
From: Mikhail Smirnov <58223117+mismirnov@users.noreply.github.com>
Date: Thu, 21 Jul 2022 20:12:40 +0300
Subject: [PATCH] Swap receiving address fix (#67)
* Increase versions to v1.17.0
* PlayMarket conf
* Swap receiving address hotfix
---
atomex.Android/Atomex.Android.csproj | 12 -----
atomex.Android/Properties/AndroidManifest.xml | 2 +-
atomex.Android/Resources/Resource.designer.cs | 2 +-
atomex.iOS/Info.plist | 4 +-
atomex.iOS/atomex.iOS.csproj | 12 -----
atomex.sln | 54 +++++++++----------
.../CurrencyViewModels/CurrencyViewModel.cs | 1 +
.../CurrencyViewModels/TezosTokenViewModel.cs | 1 +
atomex/Views/MainPage.xaml.cs | 2 +-
atomex/atomex.csproj | 12 +----
10 files changed, 36 insertions(+), 66 deletions(-)
diff --git a/atomex.Android/Atomex.Android.csproj b/atomex.Android/Atomex.Android.csproj
index d70baaa3..70a022ff 100644
--- a/atomex.Android/Atomex.Android.csproj
+++ b/atomex.Android/Atomex.Android.csproj
@@ -47,18 +47,6 @@
None
true
-
-
- true
- bin\PlayMarket
- prompt
- 4
- true
- false
- aab
- None
- true
-
diff --git a/atomex.Android/Properties/AndroidManifest.xml b/atomex.Android/Properties/AndroidManifest.xml
index a0ec701d..442c7d31 100644
--- a/atomex.Android/Properties/AndroidManifest.xml
+++ b/atomex.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/atomex.Android/Resources/Resource.designer.cs b/atomex.Android/Resources/Resource.designer.cs
index 33d9ded9..af7f4a1a 100644
--- a/atomex.Android/Resources/Resource.designer.cs
+++ b/atomex.Android/Resources/Resource.designer.cs
@@ -14,7 +14,7 @@ namespace atomex.Droid
{
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.2.8.165")]
public partial class Resource
{
diff --git a/atomex.iOS/Info.plist b/atomex.iOS/Info.plist
index 548dd671..970c5a6b 100644
--- a/atomex.iOS/Info.plist
+++ b/atomex.iOS/Info.plist
@@ -24,7 +24,7 @@
CFBundleIdentifier
com.atomex.ios
CFBundleVersion
- 1.17.0
+ 1.18.1
UILaunchStoryboardName
AtomexLaunchScreen
CFBundleName
@@ -75,7 +75,7 @@
UIStatusBarStyle
UIStatusBarStyleLightContent
CFBundleShortVersionString
- 1.17
+ 1.18
CFBundleLocalizations
en
diff --git a/atomex.iOS/atomex.iOS.csproj b/atomex.iOS/atomex.iOS.csproj
index 12a85c59..c0ac9890 100644
--- a/atomex.iOS/atomex.iOS.csproj
+++ b/atomex.iOS/atomex.iOS.csproj
@@ -75,18 +75,6 @@
8.0
true
-
- none
- true
- bin\PlayMarket
- prompt
- 4
- iPhone Developer
- true
- NSUrlSessionHandler
-
- false
-
diff --git a/atomex.sln b/atomex.sln
index 47c05f54..1ef9175d 100644
--- a/atomex.sln
+++ b/atomex.sln
@@ -37,7 +37,7 @@ Global
Release|iPhoneSimulator = Release|iPhoneSimulator
Debug|iPhone = Debug|iPhone
Release|iPhone = Release|iPhone
- PlayMarket|Any CPU = PlayMarket|Any CPU
+ ReleasePlayMarket|Any CPU = ReleasePlayMarket|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{1EC5BCE2-278E-4135-B0A0-24A538DA933D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -52,8 +52,8 @@ Global
{1EC5BCE2-278E-4135-B0A0-24A538DA933D}.Debug|iPhone.Build.0 = Debug|Any CPU
{1EC5BCE2-278E-4135-B0A0-24A538DA933D}.Release|iPhone.ActiveCfg = Release|Any CPU
{1EC5BCE2-278E-4135-B0A0-24A538DA933D}.Release|iPhone.Build.0 = Release|Any CPU
- {1EC5BCE2-278E-4135-B0A0-24A538DA933D}.PlayMarket|Any CPU.ActiveCfg = PlayMarket|Any CPU
- {1EC5BCE2-278E-4135-B0A0-24A538DA933D}.PlayMarket|Any CPU.Build.0 = PlayMarket|Any CPU
+ {1EC5BCE2-278E-4135-B0A0-24A538DA933D}.ReleasePlayMarket|Any CPU.ActiveCfg = Release|Any CPU
+ {1EC5BCE2-278E-4135-B0A0-24A538DA933D}.ReleasePlayMarket|Any CPU.Build.0 = Release|Any CPU
{FAF84F40-1F67-43E8-B04A-DEC03880862E}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
{FAF84F40-1F67-43E8-B04A-DEC03880862E}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
{FAF84F40-1F67-43E8-B04A-DEC03880862E}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
@@ -66,8 +66,8 @@ Global
{FAF84F40-1F67-43E8-B04A-DEC03880862E}.Debug|iPhone.Build.0 = Debug|iPhone
{FAF84F40-1F67-43E8-B04A-DEC03880862E}.Release|iPhone.ActiveCfg = Release|iPhone
{FAF84F40-1F67-43E8-B04A-DEC03880862E}.Release|iPhone.Build.0 = Release|iPhone
- {FAF84F40-1F67-43E8-B04A-DEC03880862E}.PlayMarket|Any CPU.ActiveCfg = PlayMarket|Any CPU
- {FAF84F40-1F67-43E8-B04A-DEC03880862E}.PlayMarket|Any CPU.Build.0 = PlayMarket|Any CPU
+ {FAF84F40-1F67-43E8-B04A-DEC03880862E}.ReleasePlayMarket|Any CPU.ActiveCfg = Release|iPhoneSimulator
+ {FAF84F40-1F67-43E8-B04A-DEC03880862E}.ReleasePlayMarket|Any CPU.Build.0 = Release|iPhoneSimulator
{6A6C43B1-1489-4B8D-AA37-941EF60E36F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6A6C43B1-1489-4B8D-AA37-941EF60E36F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6A6C43B1-1489-4B8D-AA37-941EF60E36F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -80,8 +80,8 @@ Global
{6A6C43B1-1489-4B8D-AA37-941EF60E36F0}.Debug|iPhone.Build.0 = Debug|Any CPU
{6A6C43B1-1489-4B8D-AA37-941EF60E36F0}.Release|iPhone.ActiveCfg = Release|Any CPU
{6A6C43B1-1489-4B8D-AA37-941EF60E36F0}.Release|iPhone.Build.0 = Release|Any CPU
- {6A6C43B1-1489-4B8D-AA37-941EF60E36F0}.PlayMarket|Any CPU.ActiveCfg = PlayMarket|Any CPU
- {6A6C43B1-1489-4B8D-AA37-941EF60E36F0}.PlayMarket|Any CPU.Build.0 = PlayMarket|Any CPU
+ {6A6C43B1-1489-4B8D-AA37-941EF60E36F0}.ReleasePlayMarket|Any CPU.ActiveCfg = Release|Any CPU
+ {6A6C43B1-1489-4B8D-AA37-941EF60E36F0}.ReleasePlayMarket|Any CPU.Build.0 = Release|Any CPU
{CA73F74E-F1CD-457B-A1D8-CDEFCB178F1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CA73F74E-F1CD-457B-A1D8-CDEFCB178F1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CA73F74E-F1CD-457B-A1D8-CDEFCB178F1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -94,8 +94,8 @@ Global
{CA73F74E-F1CD-457B-A1D8-CDEFCB178F1F}.Debug|iPhone.Build.0 = Debug|Any CPU
{CA73F74E-F1CD-457B-A1D8-CDEFCB178F1F}.Release|iPhone.ActiveCfg = Release|Any CPU
{CA73F74E-F1CD-457B-A1D8-CDEFCB178F1F}.Release|iPhone.Build.0 = Release|Any CPU
- {CA73F74E-F1CD-457B-A1D8-CDEFCB178F1F}.PlayMarket|Any CPU.ActiveCfg = PlayMarket|Any CPU
- {CA73F74E-F1CD-457B-A1D8-CDEFCB178F1F}.PlayMarket|Any CPU.Build.0 = PlayMarket|Any CPU
+ {CA73F74E-F1CD-457B-A1D8-CDEFCB178F1F}.ReleasePlayMarket|Any CPU.ActiveCfg = Release|Any CPU
+ {CA73F74E-F1CD-457B-A1D8-CDEFCB178F1F}.ReleasePlayMarket|Any CPU.Build.0 = Release|Any CPU
{F16E83BA-921D-4865-BD08-9C34A6B166A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F16E83BA-921D-4865-BD08-9C34A6B166A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F16E83BA-921D-4865-BD08-9C34A6B166A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -108,8 +108,8 @@ Global
{F16E83BA-921D-4865-BD08-9C34A6B166A3}.Debug|iPhone.Build.0 = Debug|Any CPU
{F16E83BA-921D-4865-BD08-9C34A6B166A3}.Release|iPhone.ActiveCfg = Release|Any CPU
{F16E83BA-921D-4865-BD08-9C34A6B166A3}.Release|iPhone.Build.0 = Release|Any CPU
- {F16E83BA-921D-4865-BD08-9C34A6B166A3}.PlayMarket|Any CPU.ActiveCfg = PlayMarket|Any CPU
- {F16E83BA-921D-4865-BD08-9C34A6B166A3}.PlayMarket|Any CPU.Build.0 = PlayMarket|Any CPU
+ {F16E83BA-921D-4865-BD08-9C34A6B166A3}.ReleasePlayMarket|Any CPU.ActiveCfg = Release|Any CPU
+ {F16E83BA-921D-4865-BD08-9C34A6B166A3}.ReleasePlayMarket|Any CPU.Build.0 = Release|Any CPU
{268686AB-CEA1-4A0B-9234-7F0267EDE059}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{268686AB-CEA1-4A0B-9234-7F0267EDE059}.Debug|Any CPU.Build.0 = Debug|Any CPU
{268686AB-CEA1-4A0B-9234-7F0267EDE059}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -122,8 +122,8 @@ Global
{268686AB-CEA1-4A0B-9234-7F0267EDE059}.Debug|iPhone.Build.0 = Debug|Any CPU
{268686AB-CEA1-4A0B-9234-7F0267EDE059}.Release|iPhone.ActiveCfg = Release|Any CPU
{268686AB-CEA1-4A0B-9234-7F0267EDE059}.Release|iPhone.Build.0 = Release|Any CPU
- {268686AB-CEA1-4A0B-9234-7F0267EDE059}.PlayMarket|Any CPU.ActiveCfg = PlayMarket|Any CPU
- {268686AB-CEA1-4A0B-9234-7F0267EDE059}.PlayMarket|Any CPU.Build.0 = PlayMarket|Any CPU
+ {268686AB-CEA1-4A0B-9234-7F0267EDE059}.ReleasePlayMarket|Any CPU.ActiveCfg = Release|Any CPU
+ {268686AB-CEA1-4A0B-9234-7F0267EDE059}.ReleasePlayMarket|Any CPU.Build.0 = Release|Any CPU
{4E3C8932-3924-4519-A49B-4D76F9FB2117}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4E3C8932-3924-4519-A49B-4D76F9FB2117}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4E3C8932-3924-4519-A49B-4D76F9FB2117}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -136,8 +136,8 @@ Global
{4E3C8932-3924-4519-A49B-4D76F9FB2117}.Debug|iPhone.Build.0 = Debug|Any CPU
{4E3C8932-3924-4519-A49B-4D76F9FB2117}.Release|iPhone.ActiveCfg = Release|Any CPU
{4E3C8932-3924-4519-A49B-4D76F9FB2117}.Release|iPhone.Build.0 = Release|Any CPU
- {4E3C8932-3924-4519-A49B-4D76F9FB2117}.PlayMarket|Any CPU.ActiveCfg = PlayMarket|Any CPU
- {4E3C8932-3924-4519-A49B-4D76F9FB2117}.PlayMarket|Any CPU.Build.0 = PlayMarket|Any CPU
+ {4E3C8932-3924-4519-A49B-4D76F9FB2117}.ReleasePlayMarket|Any CPU.ActiveCfg = Release|Any CPU
+ {4E3C8932-3924-4519-A49B-4D76F9FB2117}.ReleasePlayMarket|Any CPU.Build.0 = Release|Any CPU
{D131C645-95AA-4F2E-8797-20E053D9FE02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D131C645-95AA-4F2E-8797-20E053D9FE02}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D131C645-95AA-4F2E-8797-20E053D9FE02}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -150,8 +150,8 @@ Global
{D131C645-95AA-4F2E-8797-20E053D9FE02}.Debug|iPhone.Build.0 = Debug|Any CPU
{D131C645-95AA-4F2E-8797-20E053D9FE02}.Release|iPhone.ActiveCfg = Release|Any CPU
{D131C645-95AA-4F2E-8797-20E053D9FE02}.Release|iPhone.Build.0 = Release|Any CPU
- {D131C645-95AA-4F2E-8797-20E053D9FE02}.PlayMarket|Any CPU.ActiveCfg = PlayMarket|Any CPU
- {D131C645-95AA-4F2E-8797-20E053D9FE02}.PlayMarket|Any CPU.Build.0 = PlayMarket|Any CPU
+ {D131C645-95AA-4F2E-8797-20E053D9FE02}.ReleasePlayMarket|Any CPU.ActiveCfg = Release|Any CPU
+ {D131C645-95AA-4F2E-8797-20E053D9FE02}.ReleasePlayMarket|Any CPU.Build.0 = Release|Any CPU
{83B7F6DB-C7AE-4C7D-9E27-F2F69892EBF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{83B7F6DB-C7AE-4C7D-9E27-F2F69892EBF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{83B7F6DB-C7AE-4C7D-9E27-F2F69892EBF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -164,8 +164,8 @@ Global
{83B7F6DB-C7AE-4C7D-9E27-F2F69892EBF3}.Debug|iPhone.Build.0 = Debug|Any CPU
{83B7F6DB-C7AE-4C7D-9E27-F2F69892EBF3}.Release|iPhone.ActiveCfg = Release|Any CPU
{83B7F6DB-C7AE-4C7D-9E27-F2F69892EBF3}.Release|iPhone.Build.0 = Release|Any CPU
- {83B7F6DB-C7AE-4C7D-9E27-F2F69892EBF3}.PlayMarket|Any CPU.ActiveCfg = PlayMarket|Any CPU
- {83B7F6DB-C7AE-4C7D-9E27-F2F69892EBF3}.PlayMarket|Any CPU.Build.0 = PlayMarket|Any CPU
+ {83B7F6DB-C7AE-4C7D-9E27-F2F69892EBF3}.ReleasePlayMarket|Any CPU.ActiveCfg = Release|Any CPU
+ {83B7F6DB-C7AE-4C7D-9E27-F2F69892EBF3}.ReleasePlayMarket|Any CPU.Build.0 = Release|Any CPU
{C5958819-562B-4DFD-ABAD-2143120D76DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C5958819-562B-4DFD-ABAD-2143120D76DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C5958819-562B-4DFD-ABAD-2143120D76DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -178,8 +178,8 @@ Global
{C5958819-562B-4DFD-ABAD-2143120D76DC}.Debug|iPhone.Build.0 = Debug|Any CPU
{C5958819-562B-4DFD-ABAD-2143120D76DC}.Release|iPhone.ActiveCfg = Release|Any CPU
{C5958819-562B-4DFD-ABAD-2143120D76DC}.Release|iPhone.Build.0 = Release|Any CPU
- {C5958819-562B-4DFD-ABAD-2143120D76DC}.PlayMarket|Any CPU.ActiveCfg = PlayMarket|Any CPU
- {C5958819-562B-4DFD-ABAD-2143120D76DC}.PlayMarket|Any CPU.Build.0 = PlayMarket|Any CPU
+ {C5958819-562B-4DFD-ABAD-2143120D76DC}.ReleasePlayMarket|Any CPU.ActiveCfg = Release|Any CPU
+ {C5958819-562B-4DFD-ABAD-2143120D76DC}.ReleasePlayMarket|Any CPU.Build.0 = Release|Any CPU
{055DCA48-875D-4587-9694-C1C912F738C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{055DCA48-875D-4587-9694-C1C912F738C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{055DCA48-875D-4587-9694-C1C912F738C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -192,8 +192,8 @@ Global
{055DCA48-875D-4587-9694-C1C912F738C4}.Debug|iPhone.Build.0 = Debug|Any CPU
{055DCA48-875D-4587-9694-C1C912F738C4}.Release|iPhone.ActiveCfg = Release|Any CPU
{055DCA48-875D-4587-9694-C1C912F738C4}.Release|iPhone.Build.0 = Release|Any CPU
- {055DCA48-875D-4587-9694-C1C912F738C4}.PlayMarket|Any CPU.ActiveCfg = PlayMarket|Any CPU
- {055DCA48-875D-4587-9694-C1C912F738C4}.PlayMarket|Any CPU.Build.0 = PlayMarket|Any CPU
+ {055DCA48-875D-4587-9694-C1C912F738C4}.ReleasePlayMarket|Any CPU.ActiveCfg = Release|Any CPU
+ {055DCA48-875D-4587-9694-C1C912F738C4}.ReleasePlayMarket|Any CPU.Build.0 = Release|Any CPU
{F285DF06-9460-4BD9-948E-BE32A1AC583A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F285DF06-9460-4BD9-948E-BE32A1AC583A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F285DF06-9460-4BD9-948E-BE32A1AC583A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -206,8 +206,8 @@ Global
{F285DF06-9460-4BD9-948E-BE32A1AC583A}.Debug|iPhone.Build.0 = Debug|Any CPU
{F285DF06-9460-4BD9-948E-BE32A1AC583A}.Release|iPhone.ActiveCfg = Release|Any CPU
{F285DF06-9460-4BD9-948E-BE32A1AC583A}.Release|iPhone.Build.0 = Release|Any CPU
- {F285DF06-9460-4BD9-948E-BE32A1AC583A}.PlayMarket|Any CPU.ActiveCfg = PlayMarket|Any CPU
- {F285DF06-9460-4BD9-948E-BE32A1AC583A}.PlayMarket|Any CPU.Build.0 = PlayMarket|Any CPU
+ {F285DF06-9460-4BD9-948E-BE32A1AC583A}.ReleasePlayMarket|Any CPU.ActiveCfg = Release|Any CPU
+ {F285DF06-9460-4BD9-948E-BE32A1AC583A}.ReleasePlayMarket|Any CPU.Build.0 = Release|Any CPU
{55E444DA-533C-4A0F-8F71-42E3F80894EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{55E444DA-533C-4A0F-8F71-42E3F80894EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{55E444DA-533C-4A0F-8F71-42E3F80894EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -220,8 +220,8 @@ Global
{55E444DA-533C-4A0F-8F71-42E3F80894EC}.Debug|iPhone.Build.0 = Debug|Any CPU
{55E444DA-533C-4A0F-8F71-42E3F80894EC}.Release|iPhone.ActiveCfg = Release|Any CPU
{55E444DA-533C-4A0F-8F71-42E3F80894EC}.Release|iPhone.Build.0 = Release|Any CPU
- {55E444DA-533C-4A0F-8F71-42E3F80894EC}.PlayMarket|Any CPU.ActiveCfg = PlayMarket|Any CPU
- {55E444DA-533C-4A0F-8F71-42E3F80894EC}.PlayMarket|Any CPU.Build.0 = PlayMarket|Any CPU
+ {55E444DA-533C-4A0F-8F71-42E3F80894EC}.ReleasePlayMarket|Any CPU.ActiveCfg = Release|Any CPU
+ {55E444DA-533C-4A0F-8F71-42E3F80894EC}.ReleasePlayMarket|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{4E3C8932-3924-4519-A49B-4D76F9FB2117} = {B50066C9-027D-4C2F-A473-3592D54ABD5C}
diff --git a/atomex/ViewModel/CurrencyViewModels/CurrencyViewModel.cs b/atomex/ViewModel/CurrencyViewModels/CurrencyViewModel.cs
index 12153da7..3274450c 100644
--- a/atomex/ViewModel/CurrencyViewModels/CurrencyViewModel.cs
+++ b/atomex/ViewModel/CurrencyViewModels/CurrencyViewModel.cs
@@ -375,6 +375,7 @@ protected async void RemoveTransactonEventHandler(object sender, TransactionEven
public ReactiveCommand ConvertCurrencyCommand => _convertCurrencyCommand ??= ReactiveCommand.Create(() =>
{
_navigationService?.CloseBottomSheet();
+ _navigationService?.SetInitiatedPage(TabNavigation.Exchange);
_navigationService?.GoToExchange(Currency);
});
diff --git a/atomex/ViewModel/CurrencyViewModels/TezosTokenViewModel.cs b/atomex/ViewModel/CurrencyViewModels/TezosTokenViewModel.cs
index a2813cd9..721ddcac 100644
--- a/atomex/ViewModel/CurrencyViewModels/TezosTokenViewModel.cs
+++ b/atomex/ViewModel/CurrencyViewModels/TezosTokenViewModel.cs
@@ -353,6 +353,7 @@ public void UpdateQuotesInBaseCurrency(IQuotesProvider quotesProvider)
return; // TODO: msg to user
_navigationService?.CloseBottomSheet();
+ _navigationService?.SetInitiatedPage(TabNavigation.Exchange);
_navigationService?.GoToExchange(currency);
}
});
diff --git a/atomex/Views/MainPage.xaml.cs b/atomex/Views/MainPage.xaml.cs
index 54d029dd..b31aa834 100644
--- a/atomex/Views/MainPage.xaml.cs
+++ b/atomex/Views/MainPage.xaml.cs
@@ -125,7 +125,7 @@ public void GoToExchange(CurrencyConfig currency)
if (currency == null)
conversionViewModel?.FromViewModel?.SelectCurrencyCommand.Execute(null);
else
- conversionViewModel.SetFromCurrency(currency);
+ conversionViewModel?.SetFromCurrency(currency);
}
}
diff --git a/atomex/atomex.csproj b/atomex/atomex.csproj
index 7cd13692..2148e080 100644
--- a/atomex/atomex.csproj
+++ b/atomex/atomex.csproj
@@ -4,18 +4,10 @@
netstandard2.1
true
9.0
- Debug;Release;PlayMarket
+ Debug;Release
-
+
- true
- bin\PlayMarket
-
- 4
- obj\PlayMarket
-
- Default
- false