Add wallet flow improvements

michielpost · May 11, 2024 · 11686cc · 11686cc
1 parent f4a56d3
commit 11686cc
Show file tree

Hide file tree

Showing 10 changed files with 76 additions and 69 deletions.
diff --git a/src/aoWebWallet/Pages/ActionPage.razor b/src/aoWebWallet/Pages/ActionPage.razor
@@ -62,7 +62,7 @@
         <MudButton Color="Color.Primary" Variant="Variant.Filled" OnClick="Preview">Preview</MudButton>
         <MudText Color="Color.Error">@validation</MudText>
     }
-    else if (!started && string.IsNullOrEmpty(transactionService.LastTransaction.Data?.Id))
+    else if (!started && !string.IsNullOrEmpty(selectedWallet) && string.IsNullOrEmpty(transactionService.LastTransaction.Data?.Id))
     {
         <SendTransactionProgress DataLoader="transactionService.DryRunResult.DataLoader" Title="Getting dry run result..." />
         if (transactionService.DryRunResult.Data != null)
@@ -204,8 +204,9 @@
 
     private void OpenDialog()
     {
-        var options = new DialogOptions { CloseOnEscapeKey = true };
-        DialogService.Show<AddWalletDialog>("Add Wallet", options);
+        NavigationManager.NavigateTo("/start");
+        // var options = new DialogOptions { CloseOnEscapeKey = true };
+        // DialogService.Show<AddWalletDialog>("Add Wallet", options);
     }
 
 }
diff --git a/src/aoWebWallet/Pages/Start.razor b/src/aoWebWallet/Pages/Start.razor
@@ -3,44 +3,7 @@
 @using aoWebWallet.Models
 @using aoWebWallet.Shared
 
-<PageTitle>Start - @Program.PageTitlePostFix</PageTitle>
+<PageTitle>Add a wallet - @Program.PageTitlePostFix</PageTitle>
 
-<MudContainer Class="mt-16 px-8" MaxWidth="MaxWidth.ExtraExtraLarge">
-    <MudGrid>
-        <MudItem xs="12" md="6">
-            <MudPaper Elevation="2" Class="pa-4 border-radius-25 first-wallet">
-                <div Style="width:100%; display:flex; flex-direction:row; justify-content:center;">
-                    <div Class="background-x">
-                        <MudImage Src="images/ths.svg" Alt="hello" Elevation="25" Class="ww-image-start"/>
-                    </div>
-                </div>
-                <AddGenerateWalletComponent></AddGenerateWalletComponent>
-            </MudPaper>
-        </MudItem>
-        <MudItem xs="12" md="6">
-            <MudPaper Elevation="2" Class="pa-4 border-radius-25 first-wallet">
-                <div Style="width:100%; display:flex; flex-direction:row; justify-content:center;">
-                    <div Class="background-x">
-                        <MudImage Src="images/arconnect-logo.svg" Alt="hello" Elevation="25" Class="ww-image-start ar-logo-setup"/>
-                    </div>
-                </div>
-                <AddArConnectComponent></AddArConnectComponent>
-            </MudPaper>
-        </MudItem>
-        <MudItem xs="12" md="6">
-            <MudPaper Elevation="2" Class="pa-4 border-radius-25 first-wallet-upload">
-                <div Style="width:100%; display:flex; flex-direction:row; justify-content:center;">
-                    <div Class="background-x">
-                        <MudImage Src="images/json-logo.svg" Alt="hello" Elevation="25" Class="ww-image-start ar-logo-setup"/>
-                    </div>
-                </div>
-                <AddUploadWalletComponent></AddUploadWalletComponent>
-            </MudPaper>
-        </MudItem>
-    </MudGrid>
-</MudContainer>
+<AddWalletComponent />
 
-    @code {
-
-
-}
diff --git a/src/aoWebWallet/Pages/Wallets.razor b/src/aoWebWallet/Pages/Wallets.razor
@@ -100,11 +100,6 @@
 
 @code
 {
-    private void OpenDialog()
-    {
-        var options = new DialogOptions { CloseOnEscapeKey = true };
-        DialogService.Show<AddWalletDialog>("Add Wallet", options);
-    }
 
     private async void EditWallet(Wallet wallet)
     {

diff --git a/src/aoWebWallet/Shared/AddArConnectComponent.razor b/src/aoWebWallet/Shared/AddArConnectComponent.razor
@@ -2,6 +2,7 @@
 @inherits MvvmComponentBase<MainViewModel>
 @inject ISnackbar Snackbar
 @inject ArweaveService ArweaveService
+@inject NavigationManager NavigationManager
 
 <MudPaper Class="pa-8 mb-4 trigger-transparency">
     <MudStack Spacing="2">
@@ -125,7 +126,14 @@
 
             Snackbar.Add($"Wallet added ({address})", Severity.Info);
 
-            MudDialog?.Close(true);
+            if (MudDialog != null)
+            {
+                MudDialog.Close();
+            }
+            else
+            {
+                NavigationManager.NavigateTo($"/wallet/{wallet.Address}");
+            }
         }
     }
 

diff --git a/src/aoWebWallet/Shared/AddGenerateWalletComponent.razor b/src/aoWebWallet/Shared/AddGenerateWalletComponent.razor
@@ -2,6 +2,7 @@
 @inherits MvvmComponentBase<MainViewModel>
 @inject ArweaveService ArweaveService
 @inject ISnackbar Snackbar
+@inject NavigationManager NavigationManager
 
 <MudPaper Class="pa-8 trigger-transparency">
     <MudStack Spacing="2">
@@ -13,7 +14,7 @@
             <MudText DefaultFocus="DefaultFocus" Color="Color.Secondary">@Progress</MudText>
             <div Class="d-w-100 d-flex justify-center mt-2">
                 <MudButton Class="text-transform-none"  Color="Color.Primary" Variant="Variant.Filled" OnClick="Submit">
-                    Create AOWW Wallet
+                    Create aoWW Wallet
                 </MudButton>
             </div>
     </MudStack>
@@ -65,6 +66,11 @@
         {
             MudDialog.Close();
         }
+        else
+        {
+            NavigationManager.NavigateTo($"/wallet/{wallet.Address}");
+        }
+
         return true;
     }
 }
diff --git a/src/aoWebWallet/Shared/AddUploadWalletComponent.razor b/src/aoWebWallet/Shared/AddUploadWalletComponent.razor
@@ -2,6 +2,8 @@
 @inherits MvvmComponentBase<MainViewModel>
 @inject ArweaveService ArweaveService
 @inject ISnackbar Snackbar
+@inject NavigationManager NavigationManager
+
 
 <MudPaper Class="pa-8 trigger-transparency">
     <MudStack Spacing="2">
@@ -154,6 +156,14 @@
         {
             MudDialog.Close();
         }
+        else if(_fileNames.Count == 1)
+        {
+            NavigationManager.NavigateTo($"/wallet/{_fileNames.First().Address}");
+        }
+        else
+        {
+            NavigationManager.NavigateTo($"/");
+        }
     }
 
     private void SetDragClass()

diff --git a/src/aoWebWallet/Shared/AddWalletComponent.razor b/src/aoWebWallet/Shared/AddWalletComponent.razor
@@ -0,0 +1,34 @@
+<MudContainer Class="mt-16 px-8" MaxWidth="MaxWidth.ExtraExtraLarge">
+    <MudGrid>
+        <MudItem xs="12" md="6">
+            <MudPaper Elevation="2" Class="pa-4 border-radius-25 first-wallet">
+                <div Style="width:100%; display:flex; flex-direction:row; justify-content:center;">
+                    <div Class="background-x">
+                        <MudImage Src="images/ths.svg" Alt="hello" Elevation="25" Class="ww-image-start" />
+                    </div>
+                </div>
+                <AddGenerateWalletComponent></AddGenerateWalletComponent>
+            </MudPaper>
+        </MudItem>
+        <MudItem xs="12" md="6">
+            <MudPaper Elevation="2" Class="pa-4 border-radius-25 first-wallet">
+                <div Style="width:100%; display:flex; flex-direction:row; justify-content:center;">
+                    <div Class="background-x">
+                        <MudImage Src="images/arconnect-logo.svg" Alt="hello" Elevation="25" Class="ww-image-start ar-logo-setup" />
+                    </div>
+                </div>
+                <AddArConnectComponent></AddArConnectComponent>
+            </MudPaper>
+        </MudItem>
+        <MudItem xs="12" md="6">
+            <MudPaper Elevation="2" Class="pa-4 border-radius-25 first-wallet-upload">
+                <div Style="width:100%; display:flex; flex-direction:row; justify-content:center;">
+                    <div Class="background-x">
+                        <MudImage Src="images/json-logo.svg" Alt="hello" Elevation="25" Class="ww-image-start ar-logo-setup" />
+                    </div>
+                </div>
+                <AddUploadWalletComponent></AddUploadWalletComponent>
+            </MudPaper>
+        </MudItem>
+    </MudGrid>
+</MudContainer>
diff --git a/src/aoWebWallet/Shared/AddWalletDialog.razor b/src/aoWebWallet/Shared/AddWalletDialog.razor
@@ -4,18 +4,7 @@
 
 <MudDialog>
     <DialogContent>
-        <MudDivider Class="mb-5" />
-        <MudTabs Elevation="0" Rounded="true" ApplyEffectsToContainer="true" PanelClass="pa-6">
-            <MudTabPanel Text="New wallet">
-                <AddGenerateWalletComponent></AddGenerateWalletComponent>
-            </MudTabPanel>
-            <MudTabPanel Text="ArConnect">
-                <AddArConnectComponent></AddArConnectComponent>
-            </MudTabPanel>
-            <MudTabPanel Text="Load .json">
-                <AddUploadWalletComponent></AddUploadWalletComponent>
-            </MudTabPanel>
-        </MudTabs>
+        <AddWalletComponent />
     </DialogContent>
 </MudDialog>
 @code {

diff --git a/src/aoWebWallet/Shared/EditWalletComponent.razor b/src/aoWebWallet/Shared/EditWalletComponent.razor
@@ -4,9 +4,9 @@
 
 <MudPaper Class="pa-8">
     <MudStack Spacing="2">
-        <MudTextField @bind-Value="Wallet.Address" Required="true" RequiredError="Input a wallet address" Mask="@(new RegexMask("^[a-zA-Z0-9_\\-]{0,43}$"))" Label="Wallet Address" Variant="Variant.Text"></MudTextField>
-        <MudTextField @bind-Value="Wallet.Name" Label="Wallet Name" Variant="Variant.Text"></MudTextField>
+        <MudTextField @bind-Value="Wallet.Address" ReadOnly="@IsReadOnly" Required="true" RequiredError="Input a wallet address" Mask="@(new RegexMask("^[a-zA-Z0-9_\\-]{0,43}$"))" Label="Wallet Address" Variant="Variant.Text"></MudTextField>
         <MudText Color="Color.Secondary">@Progress</MudText>
+        <MudTextField @bind-Value="Wallet.Name" Label="Wallet Name" Variant="Variant.Text"></MudTextField>
 
         <div Class="d-w-100 d-flex justify-end mt-2">
             <MudButton OnClick="Submit"  Color="Color.Primary" Variant="Variant.Filled">
@@ -26,19 +26,14 @@
 
     public string? Progress { get; set; }
 
-    [Parameter]
-    public bool IsExpanded { get; set; }
+    public bool IsReadOnly => !Wallet.IsReadOnly;
 
 
     protected override void OnInitialized()
     {
         base.OnInitialized();
     }
 
-    private void OnExpandCollapseClick()
-    {
-        IsExpanded = !IsExpanded;
-    }
 
     public async Task<bool> Submit()
     {

diff --git a/src/aoWebWallet/aoWebWallet.csproj b/src/aoWebWallet/aoWebWallet.csproj
@@ -28,4 +28,10 @@
 	  <ProjectReference Include="..\webvNext.DataLoader\webvNext.DataLoader.csproj" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <Content Update="Shared\AddWalletComponent.razor">
+	    <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+	  </Content>
+	</ItemGroup>
+
 </Project>