Skip to content

Commit

Permalink
Swap receiving address fix (#67)
Browse files Browse the repository at this point in the history 
* Increase versions to v1.17.0

* PlayMarket conf

* Swap receiving address hotfix
  • Loading branch information
@mismirnov
mismirnov authored Jul 21, 2022
1 parent 726836b commit 04d3b47
Show file tree
Hide file tree
Showing 10 changed files with 36 additions and 66 deletions.
12 changes: 0 additions & 12 deletions atomex.Android/Atomex.Android.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,6 @@
<AndroidLinkMode>None</AndroidLinkMode>
<AndroidEnableMultiDex>true</AndroidEnableMultiDex>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'PlayMarket|AnyCPU' ">
<DebugType></DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\PlayMarket</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidManagedSymbols>true</AndroidManagedSymbols>
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
<AndroidPackageFormat>aab</AndroidPackageFormat>
<AndroidLinkMode>None</AndroidLinkMode>
<AndroidEnableMultiDex>true</AndroidEnableMultiDex>
</PropertyGroup>
<ItemGroup>
<Reference Include="Mono.Android" />
<Reference Include="System" />
Expand Down
2 changes: 1 addition & 1 deletion atomex.Android/Properties/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.17.0" package="com.atomex.android" android:versionCode="31">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.18.1" package="com.atomex.android" android:versionCode="32">
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="30" />
<application android:label="Atomex" android:allowBackup="false" android:icon="@drawable/ic_launcher">
<meta-data android:name="com.google.firebase.messaging.default_notification_icon" android:resource="@drawable/ic_notification" />
Expand Down
2 changes: 1 addition & 1 deletion atomex.Android/Resources/Resource.designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions atomex.iOS/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<key>CFBundleIdentifier</key>
<string>com.atomex.ios</string>
<key>CFBundleVersion</key>
<string>1.17.0</string>
<string>1.18.1</string>
<key>UILaunchStoryboardName</key>
<string>AtomexLaunchScreen</string>
<key>CFBundleName</key>
Expand Down Expand Up @@ -75,7 +75,7 @@
<key>UIStatusBarStyle</key>
<string>UIStatusBarStyleLightContent</string>
<key>CFBundleShortVersionString</key>
<string>1.17</string>
<string>1.18</string>
<key>CFBundleLocalizations</key>
<array>
<string>en</string>
Expand Down
12 changes: 0 additions & 12 deletions atomex.iOS/atomex.iOS.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,18 +75,6 @@
<LangVersion>8.0</LangVersion>
<BuildIpa>true</BuildIpa>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'PlayMarket|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\PlayMarket</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodesignKey>iPhone Developer</CodesignKey>
<MtouchNoSymbolStrip>true</MtouchNoSymbolStrip>
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
<MtouchVerbosity></MtouchVerbosity>
<MtouchEnableSGenConc>false</MtouchEnableSGenConc>
</PropertyGroup>
<ItemGroup>
<Compile Include="Main.cs" />
<Compile Include="AppDelegate.cs" />
Expand Down
54 changes: 27 additions & 27 deletions atomex.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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}
Expand Down
1 change: 1 addition & 0 deletions atomex/ViewModel/CurrencyViewModels/CurrencyViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,7 @@ protected async void RemoveTransactonEventHandler(object sender, TransactionEven
public ReactiveCommand<Unit, Unit> ConvertCurrencyCommand => _convertCurrencyCommand ??= ReactiveCommand.Create(() =>
{
_navigationService?.CloseBottomSheet();
_navigationService?.SetInitiatedPage(TabNavigation.Exchange);
_navigationService?.GoToExchange(Currency);
});

Expand Down
1 change: 1 addition & 0 deletions atomex/ViewModel/CurrencyViewModels/TezosTokenViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,7 @@ public void UpdateQuotesInBaseCurrency(IQuotesProvider quotesProvider)
return; // TODO: msg to user

_navigationService?.CloseBottomSheet();
_navigationService?.SetInitiatedPage(TabNavigation.Exchange);
_navigationService?.GoToExchange(currency);
}
});
Expand Down
2 changes: 1 addition & 1 deletion atomex/Views/MainPage.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public void GoToExchange(CurrencyConfig currency)
if (currency == null)
conversionViewModel?.FromViewModel?.SelectCurrencyCommand.Execute(null);
else
conversionViewModel.SetFromCurrency(currency);
conversionViewModel?.SetFromCurrency(currency);
}
}

Expand Down
12 changes: 2 additions & 10 deletions atomex/atomex.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,10 @@
<TargetFramework>netstandard2.1</TargetFramework>
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
<LangVersion>9.0</LangVersion>
<Configurations>Debug;Release;PlayMarket</Configurations>
<Configurations>Debug;Release</Configurations>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'PlayMarket|AnyCPU' ">
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType></DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\PlayMarket</OutputPath>
<DefineConstants></DefineConstants>
<WarningLevel>4</WarningLevel>
<IntermediateOutputPath>obj\PlayMarket</IntermediateOutputPath>
<NoWarn></NoWarn>
<LangVersion>Default</LangVersion>
<NoStdLib>false</NoStdLib>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2291" />
Expand Down

0 comments on commit 04d3b47

Please sign in to comment.