Skip to content

Commit 5be2b64

Browse files
michielpostmichielpost
committed
Fixed AO transfers
1 parent f591961 commit 5be2b64

File tree

14 files changed

+77
-73
lines changed

14 files changed

+77
-73
lines changed

‎src/aoWebWallet.Tests/StorageServiceTests.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ public async Task TestBuildInTokenData()
1818

1919
TokenClient tokenClient = new TokenClient(Options.Create(new ArweaveConfig()), new HttpClient());
2020

21+
result.Reverse();
22+
2123
foreach(var token in result)
2224
{
2325
//Get live data

‎src/aoWebWallet.Tests/aoWebWallet.Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
18-
<PackageReference Include="MSTest.TestAdapter" Version="3.7.1" />
19-
<PackageReference Include="MSTest.TestFramework" Version="3.7.1" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
18+
<PackageReference Include="MSTest.TestAdapter" Version="3.8.2" />
19+
<PackageReference Include="MSTest.TestFramework" Version="3.8.2" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

‎src/aoWebWallet/Constants.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
22
{
33
public static class Constants
44
{
5-
public static string AoTokenId => "m3PaWzK4PTG9lAaqYQPaPdOcXdO8hYqi5Fe9NWqXd0w";
6-
public static string AoProxyTokenId => "Pi-WmAQp2-mh-oWH9lWpz5EthlUDj_W0IusAv-RXhRk";
5+
//public static string AoTokenId => "m3PaWzK4PTG9lAaqYQPaPdOcXdO8hYqi5Fe9NWqXd0w";
6+
//public static string AoProxyTokenId => "Pi-WmAQp2-mh-oWH9lWpz5EthlUDj_W0IusAv-RXhRk";
7+
8+
public static string AoTokenId => "0syT13r0s0tgPmIed95bJnuSqaD29HQNN8D3ElLSrsc";
9+
710
public static string CredTokenId => "Sa0iBLPNyJQrwpTTG-tWLQU-1QeUAJA73DdxGGiKoJc";
811
public static string LlamaTokenId => "pazXumQI-HPH7iFGfTC-4_7biSnqz_U67oFAGry5zUY";
912
}

‎src/aoWebWallet/Pages/AddressBook.razor‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
}
6666
else
6767
{
68-
<MudGrid Row="true" Justify="Justify.Center" Class="p-2">
68+
<MudGrid Justify="Justify.Center" Class="p-2">
6969
<MudItem sm="12" xs="12">
7070
<MudText>Your Address Book is currently empty.</MudText>
7171
<MudButton OnClick="OpenDialog">Add your first contact</MudButton>
@@ -108,15 +108,15 @@
108108
var parameters = new DialogParameters<EditWalletComponent> { { x => x.Wallet, tempWallet } };
109109

110110
var options = new DialogOptions { CloseOnEscapeKey = true, MaxWidth = MaxWidth.Small, FullWidth = true };
111-
DialogService.Show<EditWalletComponent>("Add Contact", parameters, options);
111+
DialogService.ShowAsync<EditWalletComponent>("Add Contact", parameters, options);
112112
}
113113

114114
private async void EditWallet(Wallet wallet)
115115
{
116116
var parameters = new DialogParameters<EditWalletComponent> { { x => x.Wallet, wallet } };
117117

118118
var options = new DialogOptions { CloseOnEscapeKey = true, MaxWidth = MaxWidth.Small, FullWidth = true };
119-
DialogService.Show<EditWalletComponent>("Edit Contact", parameters, options);
119+
DialogService.ShowAsync<EditWalletComponent>("Edit Contact", parameters, options);
120120

121121
StateHasChanged();
122122
}

‎src/aoWebWallet/Pages/Tokens.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
private void OpenAddTokenDialog()
5353
{
5454
var options = new DialogOptions { CloseOnEscapeKey = true };
55-
DialogService.Show<AddTokenDialog>("Add Token", options);
55+
DialogService.ShowAsync<AddTokenDialog>("Add Token", options);
5656
}
5757

5858
private async void ToggleVisibility(Token token)

‎src/aoWebWallet/Pages/WalletDetail.razor‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,15 +243,15 @@
243243
private void OpenAddTokenDialog()
244244
{
245245
var options = new DialogOptions { CloseOnEscapeKey = true };
246-
DialogService.Show<AddTokenToWalletDialog>("Add Token", options);
246+
DialogService.ShowAsync<AddTokenToWalletDialog>("Add Token", options);
247247
}
248248

249249
private async void EditWallet(Wallet wallet)
250250
{
251251
var parameters = new DialogParameters<EditWalletComponent> { { x => x.Wallet, wallet } };
252252

253253
var options = new DialogOptions { CloseOnEscapeKey = true, MaxWidth = MaxWidth.Small, FullWidth = true };
254-
DialogService.Show<EditWalletComponent>("Edit Wallet", parameters, options);
254+
DialogService.ShowAsync<EditWalletComponent>("Edit Wallet", parameters, options);
255255

256256
StateHasChanged();
257257
}

‎src/aoWebWallet/Pages/Wallets.razor‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,12 @@
114114
new BreadcrumbItem("", href: "#")
115115
};
116116

117-
private async void EditWallet(Wallet wallet)
117+
private void EditWallet(Wallet wallet)
118118
{
119119
var parameters = new DialogParameters<EditWalletComponent> { { x => x.Wallet, wallet } };
120120

121121
var options = new DialogOptions { CloseOnEscapeKey = true, MaxWidth = MaxWidth.Small, FullWidth = true };
122-
DialogService.Show<EditWalletComponent>("Edit Wallet", parameters, options);
122+
DialogService.ShowAsync<EditWalletComponent>("Edit Wallet", parameters, options);
123123

124124
StateHasChanged();
125125
}

‎src/aoWebWallet/Services/StorageService.cs‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public async ValueTask<List<MemeFrameProcess>> GetMemeFrames()
2323
var result = await localStorage.GetItemAsync<List<MemeFrameProcess>>(MEMFRAME_LIST_KEY);
2424
result = result ?? new();
2525

26-
AddSystemMemeFrames(result,"OT9qTE2467gcozb2g8R6D6N3nQS94ENcaAIJfUzHCww", Constants.CredTokenId); //TRUNK
26+
//AddSystemMemeFrames(result,"OT9qTE2467gcozb2g8R6D6N3nQS94ENcaAIJfUzHCww", Constants.CredTokenId); //TRUNK
2727
AddSystemMemeFrames(result,"2gM9n9QO6JG1_bZhCWr3fuEKJtzRgx1xvYUB92nVFAs", Constants.CredTokenId); //AORTA
2828
AddSystemMemeFrames(result,"-a4T7XLMDGTcu8_preKXdUT6__4sJkMhYLEJZkXUYd0", Constants.CredTokenId); //MEME
2929
AddSystemMemeFrames(result,"rik3eCayInKVNzSMdoxeSEfpxNd5U7tx1H8NAveg4o8", Constants.CredTokenId); //FINCH-MEME
@@ -67,18 +67,18 @@ public static void AddSystemTokens(List<Token> result)
6767
Logo = "UkS-mdoiG8hcAClhKK8ch4ZhEzla0mCPDOix9hpdSFE",
6868
Name = "AO",
6969
Ticker = "AO"
70-
},
71-
proxyTokenId:Constants.AoProxyTokenId); //AO
72-
73-
AddSystemToken(result, Constants.CredTokenId,
74-
new TokenData
75-
{
76-
TokenId = Constants.CredTokenId,
77-
Denomination = 3,
78-
Logo = "eIOOJiqtJucxvB4k8a-sEKcKpKTh9qQgOV3Au7jlGYc",
79-
Name = "AOCRED",
80-
Ticker = "testnet-AOCRED"
81-
}); //CRED
70+
});//,
71+
//proxyTokenId:Constants.AoProxyTokenId); //AO
72+
73+
//AddSystemToken(result, Constants.CredTokenId,
74+
// new TokenData
75+
// {
76+
// TokenId = Constants.CredTokenId,
77+
// Denomination = 3,
78+
// Logo = "eIOOJiqtJucxvB4k8a-sEKcKpKTh9qQgOV3Au7jlGYc",
79+
// Name = "AOCRED",
80+
// Ticker = "testnet-AOCRED"
81+
// }); //CRED
8282

8383
AddSystemToken(result, Constants.LlamaTokenId,
8484
new TokenData
@@ -101,35 +101,35 @@ public static void AddSystemTokens(List<Token> result)
101101
Ticker = "BRKTST"
102102
}); //BARK
103103

104-
AddSystemToken(result, "OT9qTE2467gcozb2g8R6D6N3nQS94ENcaAIJfUzHCww",
105-
new TokenData
106-
{
107-
TokenId = "OT9qTE2467gcozb2g8R6D6N3nQS94ENcaAIJfUzHCww",
108-
Denomination = 3,
109-
Logo = "4eTBOaxZSSyGbpKlHyilxNKhXbocuZdiMBYIORjS4f0",
110-
Name = "TRUNK",
111-
Ticker = "TRUNK"
112-
}); //TRUNK
113-
114-
AddSystemToken(result, "aYrCboXVSl1AXL9gPFe3tfRxRf0ZmkOXH65mKT0HHZw",
115-
new TokenData
116-
{
117-
TokenId = "aYrCboXVSl1AXL9gPFe3tfRxRf0ZmkOXH65mKT0HHZw",
118-
Denomination = 6,
119-
Logo = "wfI-5PlYXL66_BqquCXm7kq-ic1keu0b2CqRjw82yrU",
120-
Name = "AR.IO EXP",
121-
Ticker = "EXP"
122-
});
123-
124-
AddSystemToken(result, "BUhZLMwQ6yZHguLtJYA5lLUa9LQzLXMXRfaq9FVcPJc",
125-
new TokenData
126-
{
127-
TokenId = "BUhZLMwQ6yZHguLtJYA5lLUa9LQzLXMXRfaq9FVcPJc",
128-
Denomination = 12,
129-
Logo = "quMiswyIjELM0FZtjVSiUtg9_-pvQ8K25yfxrp1TgnQ",
130-
Name = "0rbit Points",
131-
Ticker = "0RBT"
132-
}); //0rbit
104+
//AddSystemToken(result, "OT9qTE2467gcozb2g8R6D6N3nQS94ENcaAIJfUzHCww",
105+
// new TokenData
106+
// {
107+
// TokenId = "OT9qTE2467gcozb2g8R6D6N3nQS94ENcaAIJfUzHCww",
108+
// Denomination = 3,
109+
// Logo = "4eTBOaxZSSyGbpKlHyilxNKhXbocuZdiMBYIORjS4f0",
110+
// Name = "TRUNK",
111+
// Ticker = "TRUNK"
112+
// }); //TRUNK
113+
114+
//AddSystemToken(result, "aYrCboXVSl1AXL9gPFe3tfRxRf0ZmkOXH65mKT0HHZw",
115+
// new TokenData
116+
// {
117+
// TokenId = "aYrCboXVSl1AXL9gPFe3tfRxRf0ZmkOXH65mKT0HHZw",
118+
// Denomination = 6,
119+
// Logo = "wfI-5PlYXL66_BqquCXm7kq-ic1keu0b2CqRjw82yrU",
120+
// Name = "AR.IO EXP",
121+
// Ticker = "EXP"
122+
// });
123+
124+
//AddSystemToken(result, "BUhZLMwQ6yZHguLtJYA5lLUa9LQzLXMXRfaq9FVcPJc",
125+
// new TokenData
126+
// {
127+
// TokenId = "BUhZLMwQ6yZHguLtJYA5lLUa9LQzLXMXRfaq9FVcPJc",
128+
// Denomination = 12,
129+
// Logo = "quMiswyIjELM0FZtjVSiUtg9_-pvQ8K25yfxrp1TgnQ",
130+
// Name = "0rbit Points",
131+
// Ticker = "0RBT"
132+
// }); //0rbit
133133

134134
AddSystemToken(result, "PBg5TSJPQp9xgXGfjN27GA28Mg5bQmNEdXH2TXY4t-A",
135135
new TokenData
@@ -176,9 +176,9 @@ public static void AddSystemTokens(List<Token> result)
176176
{
177177
TokenId = "GcFxqTQnKHcr304qnOcq00ZqbaYGDn4Wbb0DHAM-wvU",
178178
Denomination = 12,
179-
Logo = "K8nurc9H0_ZQm17jbs3ryEs6MrlX-oIK_krpprWlQ-Q",
179+
Logo = "seXozJrsP0OgI0gvAnr8zmfxiHHb5iSlI9wMI8SdamE",
180180
Name = "Astro USD (Test)",
181-
Ticker = "USDA-TST"
181+
Ticker = "USDA"
182182
});
183183

184184
AddSystemToken(result, "NG-0lVX882MG5nhARrSzyprEK6ejonHpdUmaaMPsHE8",

‎src/aoWebWallet/Shared/NavMenu.razor‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565

6666
@code {
6767
private string[] icons = { Icons.Material.Filled.WbSunny, Icons.Material.Filled.NightlightRound };
68-
int logoCount = 1;
6968

7069
protected override void OnInitialized()
7170
{

‎src/aoWebWallet/aoWebWallet.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@
1818

1919
<ItemGroup>
2020
<PackageReference Include="Append.Blazor.WebShare" Version="7.0.0" />
21-
<PackageReference Include="ArweaveAO" Version="0.3.0" />
22-
<PackageReference Include="ArweaveBlazor" Version="0.1.0" />
21+
<PackageReference Include="ArweaveAO" Version="0.3.1" />
22+
<PackageReference Include="ArweaveBlazor" Version="0.1.2" />
2323
<PackageReference Include="ClipLazor" Version="3.0.2" />
2424
<PackageReference Include="CodeBeam.MudBlazor.Extensions" Version="8.0.0" />
25-
<PackageReference Include="MudBlazor" Version="8.0.0" />
25+
<PackageReference Include="MudBlazor" Version="8.3.0" />
2626
<PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
27-
<PackageReference Include="BlazorWasmPreRendering.Build" Version="5.0.0" />
27+
<PackageReference Include="BlazorWasmPreRendering.Build" Version="5.0.1" />
2828
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
29-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.1" />
30-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.1" PrivateAssets="all" />
29+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.2" />
30+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.2" PrivateAssets="all" />
3131
<PackageReference Include="ReactorBlazorQRCodeScanner" Version="1.0.10" />
32-
<PackageReference Include="Soenneker.Blazor.Utils.Navigation" Version="3.0.629" />
32+
<PackageReference Include="Soenneker.Blazor.Utils.Navigation" Version="3.0.835" />
3333
</ItemGroup>
3434

3535
<ItemGroup>

0 commit comments

Comments
 (0)