diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0dfbeb4..2c69dcf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,8 +3,6 @@ name: Build # Run workflow on every push to the master branch on: push: - branches-ignore: - - master jobs: publish: diff --git a/README.md b/README.md index f5bf861..95d3152 100644 --- a/README.md +++ b/README.md @@ -30,8 +30,6 @@ This project is build with C#, using the Blazor framework and compiled to WebAss ## Screenshots -## Donations -Happy with this application? Donations help fund the further development. Donations can go to: zsXSvJtHVSK4QyPch4Uf0JMiZi9uEhgVvyz6qeEJcfY ## Install for local development @@ -47,5 +45,13 @@ Run: - Start the app: `dotnet watch` (for hot reloading support) or `dotnet run` - Now listening on: http://localhost:35441/ +## Credits +* [Michiel Post](http://www.michielpost.nl) ([@michielpostnl](https://twitter.com/michielpostnl)) - tech and development +* [Nuno Lopes](https://github.com/lopezi) ([@2n1u0](https://twitter.com/2n1u0)) - design and frontend + +## Donations +Happy with this application? Donations help fund the further development. Donations can go to: zsXSvJtHVSK4QyPch4Uf0JMiZi9uEhgVvyz6qeEJcfY + ## Open source credits -[MudBlazor Components](https://mudblazor.com/) - UI Components \ No newline at end of file +[MudBlazor Components](https://mudblazor.com/) - UI Components + diff --git a/src/ArweaveBlazor/ArweaveService.cs b/src/ArweaveBlazor/ArweaveService.cs index aad9800..c1a2490 100644 --- a/src/ArweaveBlazor/ArweaveService.cs +++ b/src/ArweaveBlazor/ArweaveService.cs @@ -25,7 +25,7 @@ public ArweaveService(IJSRuntime jsRuntime) { moduleTask = new(() => LoadScripts("./_content/ArweaveBlazor/arweaveJsInterop.js", jsRuntime).AsTask()); arweaveTask = new(() => LoadScripts("https://unpkg.com/arweave/bundles/web.bundle.min.js", jsRuntime).AsTask()); - //aoTask = new(() => LoadScripts("https://www.unpkg.com/@permaweb/aoconnect@0.0.45/dist/browser.js", jsRuntime).AsTask()); + //aoTask = new(() => LoadScripts("https://www.unpkg.com/@permaweb/aoconnect@0.0.48/dist/browser.js", jsRuntime).AsTask()); InitArweave(); } diff --git a/src/aoWebWallet/Layout/MainLayout.razor b/src/aoWebWallet/Layout/MainLayout.razor index 80c029a..99729ce 100644 --- a/src/aoWebWallet/Layout/MainLayout.razor +++ b/src/aoWebWallet/Layout/MainLayout.razor @@ -12,11 +12,11 @@ - + - + @*aoWebWallet*@ diff --git a/src/aoWebWallet/Pages/About.razor b/src/aoWebWallet/Pages/About.razor index 8de827d..c5882ad 100644 --- a/src/aoWebWallet/Pages/About.razor +++ b/src/aoWebWallet/Pages/About.razor @@ -10,7 +10,7 @@ Open Source web wallet for ao on Arweave - Created for the Hack the Weave hackathon by Michiel Post and Nuno Lopes + Created for the Hack the Weave hackathon by Michiel Post and Nuno Lopes @@ -52,16 +52,6 @@ - - - - Happy with this application? Donations help fund the further development. Donations can go to: - - - zsXSvJtHVSK4QyPch4Uf0JMiZi9uEhgVvyz6qeEJcfY - - - diff --git a/src/aoWebWallet/Pages/WalletDetail.razor b/src/aoWebWallet/Pages/WalletDetail.razor index 382719f..0ac17c0 100644 --- a/src/aoWebWallet/Pages/WalletDetail.razor +++ b/src/aoWebWallet/Pages/WalletDetail.razor @@ -21,7 +21,7 @@ @if(BindingContext.SelectedWallet?.Source == WalletTypes.Explorer) { - + } diff --git a/src/aoWebWallet/Services/StorageService.cs b/src/aoWebWallet/Services/StorageService.cs index 915ba97..bd19a45 100644 --- a/src/aoWebWallet/Services/StorageService.cs +++ b/src/aoWebWallet/Services/StorageService.cs @@ -46,7 +46,12 @@ public async ValueTask AddToken(string tokenId, TokenData data, bool isUserAdded var existing = list.Where(x => x.TokenId == tokenId).FirstOrDefault(); if (existing != null) - return; + { + existing.IsVisible = true; + + if(!existing.IsSystemToken) + existing.IsUserAdded = true; + } else list.Add(new Token { TokenId = tokenId, TokenData = data, IsUserAdded = isUserAdded }); diff --git a/src/aoWebWallet/ViewModels/MainViewModel.cs b/src/aoWebWallet/ViewModels/MainViewModel.cs index 88695ad..20f4a19 100644 --- a/src/aoWebWallet/ViewModels/MainViewModel.cs +++ b/src/aoWebWallet/ViewModels/MainViewModel.cs @@ -13,7 +13,7 @@ namespace aoWebWallet.ViewModels { public partial class MainViewModel : ObservableRecipient { - private const string CLAIM_PROCESS_ID = "MHKFm549j6tCN0t6yF2ltUc1D3AqxWZRWKdtbncvrVQ"; + private const string CLAIM_PROCESS_ID = "5Mv1TBYZvKjNlWUpH78hWORIhqj1uqn_wdkJrA7emfU"; private readonly DataService dataService; private readonly TokenClient tokenClient;