update core library and version to v1.0.22

Atomex.Client.Wpf.Installer/Product.wxs

@@ -3,7 +3,7 @@
 <?define Name = "Atomex Client" ?>
 <?define Manufacturer = "Atomex.me" ?>
 <?define Description = "Multicurrency HD wallet with built-in hybrid exchange based on atomic swap." ?>
-<?define Version = "1.0.21" ?>
+<?define Version = "1.0.22" ?>
 <?define UpgradeCode = "DB7FCF8D-E0C6-4C99-A6B1-3FB6D703F97E" ?>
 <?define ExeName = "Atomex.Client.Wpf.exe" ?>
 

Atomex.Client.Wpf/App.xaml.cs

@@ -84,7 +84,7 @@ protected override void OnStartup(StartupEventArgs e)
             var mainView = new MainWindow();
             mainView.DataContext = new MainViewModel(AtomexApp, mainView, mainView);
             mainView.Show();        
-            mainView.ShowStartDialog(new StartViewModel(AtomexApp, mainView));
+            mainView.ShowDialog(Dialogs.Start, new StartViewModel(AtomexApp, mainView));
 
             MainWindow = mainView;
 

Atomex.Client.Wpf/Atomex.Client.Wpf.csproj

@@ -30,6 +30,7 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <LangVersion>preview</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -319,14 +320,11 @@
     <Compile Include="Common\DecimalExtensions.cs" />
     <Compile Include="Common\DesignTime.cs" />
     <Compile Include="Common\Environment.cs" />
-    <Compile Include="Common\IPageResolver.cs" />
     <Compile Include="Common\Msi\MsiApi.cs" />
     <Compile Include="Common\Msi\MsiPackage.cs" />
     <Compile Include="Common\Msi\MsiProduct.cs" />
     <Compile Include="Common\Msi\PropsCollection.cs" />
     <Compile Include="Common\MsiProductProvider.cs" />
-    <Compile Include="Common\Navigation.cs" />
-    <Compile Include="Common\PageResolver.cs" />
     <Compile Include="Common\RelayCommand.cs" />
     <Compile Include="Common\SingleApp.cs" />
     <Compile Include="Common\ChildWindowHelper.cs" />
@@ -354,6 +352,7 @@
     <Compile Include="Helpers\ComboBoxHelper.cs" />
     <Compile Include="ViewModels\ConversionConfirmationViewModel.cs" />
     <Compile Include="ViewModels\CreateWalletViewModels\WalletTypeViewModel.cs" />
+    <Compile Include="ViewModels\Dialogs.cs" />
     <Compile Include="ViewModels\MyWalletsViewModel.cs" />
     <Compile Include="ViewModels\Abstract\IExpandable.cs" />
     <Compile Include="ViewModels\CreateWalletViewModel.cs" />
@@ -364,12 +363,13 @@
     <Compile Include="ViewModels\CurrencyViewModels\LitecoinCurrencyViewModel.cs" />
     <Compile Include="ViewModels\CurrencyViewModels\TezosCurrencyViewModel.cs" />
     <Compile Include="ViewModels\MessageViewModel.cs" />
-    <Compile Include="ViewModels\SendViewModels\BakerViewModel.cs" />
-    <Compile Include="ViewModels\SendViewModels\DelegateConfirmationViewModel.cs" />
-    <Compile Include="ViewModels\SendViewModels\SendConfirmationViewModel.cs" />
-    <Compile Include="ViewModels\SendViewModels\DelegateViewModel.cs" />
+    <Compile Include="ViewModels\BakerViewModel.cs" />
+    <Compile Include="ViewModels\DelegateConfirmationViewModel.cs" />
+    <Compile Include="ViewModels\SendConfirmationViewModel.cs" />
+    <Compile Include="ViewModels\DelegateViewModel.cs" />
+    <Compile Include="ViewModels\SendViewModels\BitcoinBasedSendViewModel.cs" />
     <Compile Include="ViewModels\SendViewModels\SendViewModel.cs" />
-    <Compile Include="ViewModels\SendViewModels\WalletAddressViewModel.cs" />
+    <Compile Include="ViewModels\WalletAddressViewModel.cs" />
     <Compile Include="ViewModels\SettingsViewModel.cs" />
     <Compile Include="ViewModels\SwapViewModel.cs" />
     <Compile Include="ViewModels\SwapViewModelFactory.cs" />
@@ -410,15 +410,24 @@
     <Compile Include="Views\DelegatingPage.xaml.cs">
       <DependentUpon>DelegatingPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\SendViews\DelegateConfirmationPage.xaml.cs">
+    <Compile Include="Views\DelegateConfirmationPage.xaml.cs">
       <DependentUpon>DelegateConfirmationPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\SendViews\SendConfirmationPage.xaml.cs">
+    <Compile Include="Views\SendConfirmationPage.xaml.cs">
       <DependentUpon>SendConfirmationPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\SendViews\DelegatePage.xaml.cs">
+    <Compile Include="Views\DelegatePage.xaml.cs">
       <DependentUpon>DelegatePage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\SendViews\BitcoinBasedSendPage.xaml.cs">
+      <DependentUpon>BitcoinBasedSendPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\SendViews\EthereumSendPage.xaml.cs">
+      <DependentUpon>EthereumSendPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\SendViews\TezosSendPage.xaml.cs">
+      <DependentUpon>TezosSendPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\SendViews\SendPage.xaml.cs">
       <DependentUpon>SendPage.xaml</DependentUpon>
     </Compile>
@@ -549,15 +558,27 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Views\SendViews\DelegateConfirmationPage.xaml">
+    <Page Include="Views\DelegateConfirmationPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\SendConfirmationPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\DelegatePage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Views\SendViews\SendConfirmationPage.xaml">
+    <Page Include="Views\SendViews\BitcoinBasedSendPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\SendViews\EthereumSendPage.xaml">
       <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
     </Page>
-    <Page Include="Views\SendViews\DelegatePage.xaml">
+    <Page Include="Views\SendViews\TezosSendPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>

Atomex.Client.Wpf/Controls/ChildWindowManager.cs

@@ -73,16 +73,14 @@ public static Task<TResult> ShowChildWindowAsync<TResult>(
             window.Dispatcher.VerifyAccess();
 
             var metroDialogContainer = window.Template.FindName("PART_MetroActiveDialogContainer", window) as Grid;
-            metroDialogContainer = metroDialogContainer ?? window.Template.FindName("PART_MetroInactiveDialogsContainer", window) as Grid;
+            metroDialogContainer ??= window.Template.FindName("PART_MetroInactiveDialogsContainer", window) as Grid;
 
             if (metroDialogContainer == null)
-            {
                 throw new InvalidOperationException("The provided child window can not add, there is no container defined.");
-            }
+
             if (metroDialogContainer.Children.Contains(dialog))
-            {
                 throw new InvalidOperationException("The provided child window is already visible in the specified window.");
-            }
+
             if (overlayFillBehavior == OverlayFillBehavior.WindowContent)
             {
                 metroDialogContainer.SetValue(Grid.RowProperty, (int)metroDialogContainer.GetValue(Grid.RowProperty) + 1);
@@ -132,14 +130,11 @@ public static Task<TResult> ShowChildWindowAsync<TResult>(
         {
             window.Dispatcher.VerifyAccess();
 
-            if (container == null)
-            {
+            if (container == null)     
                 throw new InvalidOperationException("The provided child window can not add, there is no container defined.");
-            }
+
             if (container.Children.Contains(dialog))
-            {
                 throw new InvalidOperationException("The provided child window is already visible in the specified window.");
-            }
 
             return ShowChildWindowInternalAsync<TResult>(dialog, container);
         }
@@ -197,7 +192,7 @@ public static void CloseAllChildWindows(this Window window)
             window.Dispatcher.VerifyAccess();
 
             var container = window.Template.FindName("PART_MetroActiveDialogContainer", window) as Grid;
-            container = container ?? window.Template.FindName("PART_MetroInactiveDialogsContainer", window) as Grid;
+            container ??= window.Template.FindName("PART_MetroInactiveDialogsContainer", window) as Grid;
 
             if (container == null)
                 throw new InvalidOperationException("There is no container defined.");

Atomex.Client.Wpf/Controls/IDialogViewer.cs

@@ -6,31 +6,18 @@ namespace Atomex.Client.Wpf.Controls
 {
     public interface IDialogViewer
     {
+        void ShowDialog(
+            int dialogId,
+            object dataContext,
+            Action loaded = null,
+            Action canceled = null,
+            int defaultPageId = 0);
+        void HideDialog(int dialogId);
         void HideAllDialogs();
 
-        void ShowStartDialog(object dataContext);
-        void HideStartDialog();
-
-        void ShowCreateWalletDialog(object dataContext);
-        void HideCreateWalletDialog();
-
-        void ShowSendDialog(object dataContext, Action dialogLoaded = null);
-        void HideSendDialog();
-
-        void ShowDelegateDialog(object dataContext, Action dialogLoaded = null);
-        void HideDelegateDialog();
-
-        void ShowConversionConfirmationDialog(object dataContext, Action dialogLoaded = null);
-        void HideConversionConfirmationDialog();
-
-        void ShowReceiveDialog(object dataContext);
-        void HideReceiveDialog();
-
-        void ShowUnlockDialog(object dataContext, EventHandler canceled = null);
-        void HideUnlockDialog();
-
-        void ShowMyWalletsDialog(object dataContext);
-        void HideMyWalletsDialog();
+        void PushPage(int dialogId, int pageId, object dataContext = null);
+        void PopPage(int dialogId);
+        void Back(int dialogId);
 
         void ShowMessage(string title, string message);
         Task<MessageDialogResult> ShowMessageAsync(string title, string message, MessageDialogStyle style);