Merge branch 'release/3.1.0'

bol-project · Dec 4, 2024 · c399f7b · c399f7b
2 parents aea319c + f2ff408
commit c399f7b
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 11 deletions.
diff --git a/src/BolWallet/BolWallet.csproj b/src/BolWallet/BolWallet.csproj
@@ -9,7 +9,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>BolWallet</RootNamespace>
     <UseMaui>true</UseMaui>
-    <MauiVersion>9.0.10</MauiVersion>
+    <MauiVersion>9.0.12</MauiVersion>
     <SingleProject>true</SingleProject>
     <ImplicitUsings>enable</ImplicitUsings>
 

diff --git a/src/BolWallet/Pages/CertifyPage.razor b/src/BolWallet/Pages/CertifyPage.razor
@@ -123,6 +123,23 @@
             </MudCard>
         </MudItem>
     }
+    @if (!ViewModel.IsMultiCitizenship && ViewModel.IsCheckProcessOver)
+    {
+         <MudItem xs="12" sm="7" style="margin-left: auto; margin-right: auto; margin-top: 10px;">
+            <MudCard Class="styled-card">
+                <MudCardHeader>
+                    <CardHeaderAvatar>
+                        <MudAvatar Color="Color.Success">
+                            <MudIcon Icon="@Icons.Material.Rounded.ThumbUp"/>
+                        </MudAvatar>
+                    </CardHeaderAvatar>
+                    <CardHeaderContent>
+                        <MudText Typo="Typo.h6">ShortHash is not in MultiCitizenship List.</MudText>
+                    </CardHeaderContent>
+                </MudCardHeader>
+            </MudCard>
+        </MudItem>
+    }
     <MudItem hidden="@(!ViewModel.AlternativeAccounts.Any())" xs="12" sm="7" style="margin-left: auto; margin-right: auto; margin-top: 10px;">
         <MudCard>
             <MudCardActions>

diff --git a/src/BolWallet/Platforms/Android/AndroidManifest.xml b/src/BolWallet/Platforms/Android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.bol.bolwallet" android:versionCode="9" android:versionName="3.0.0">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.bol.bolwallet" android:versionCode="10" android:versionName="3.1.0 (2024.1204.2140)">
 	<application android:allowBackup="true" android:icon="@mipmap/appicon" android:supportsRtl="true" android:label="BoL Wallet"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.INTERNET" />

diff --git a/src/BolWallet/Platforms/MacCatalyst/Info.plist b/src/BolWallet/Platforms/MacCatalyst/Info.plist
@@ -31,9 +31,9 @@
 		<string>processing</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2024.1113.0540</string>
+	<string>2024.1204.2140</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.0</string>
+	<string>3.1.0</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/src/BolWallet/Platforms/iOS/Info.plist b/src/BolWallet/Platforms/iOS/Info.plist
@@ -35,9 +35,9 @@
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>The app can use the photo library to select photos from your library and use them when creating a new wallet.</string>
 	<key>CFBundleVersion</key>
-	<string>2024.1113.0540</string>
+	<string>2024.1204.2140</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.0</string>
+	<string>3.1.0</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/src/BolWallet/ViewModels/AddMultiCitizenshipViewModel.cs b/src/BolWallet/ViewModels/AddMultiCitizenshipViewModel.cs
@@ -100,14 +100,24 @@ public async Task Register()
         try
         {
             IsLoading = true;
-            await _bolService.AddMultiCitizenship(MultiCitizenshipModel.CountryCode, ShortHash);
+
+            string countryCode = !string.IsNullOrWhiteSpace(MultiCitizenshipShortHashModel.CountryCode)
+                ? MultiCitizenshipShortHashModel.CountryCode
+                : MultiCitizenshipModel.CountryCode;
+
+            if (string.IsNullOrWhiteSpace(countryCode))
+            {
+                await Toast.Make("Country code is required to register.").Show();
+                return;
+            }
+
+            await _bolService.AddMultiCitizenship(countryCode, ShortHash);
 
             for (int i = 0; i < 20; i++)
             {
                 try
                 {
-                    IsMultiCitizenshipRegistered =
-                        await _bolService.IsMultiCitizenship(MultiCitizenshipModel.CountryCode, ShortHash);
+                    IsMultiCitizenshipRegistered = await _bolService.IsMultiCitizenship(countryCode, ShortHash);
                 }
                 catch (RpcException)
                 {
@@ -126,7 +136,7 @@ public async Task Register()
         {
             IsLoading = false;
         }
-    }
+    }
 
     public void OnKnownShortHashToggleChange(bool newValue)
     {

diff --git a/src/BolWallet/ViewModels/CertifyViewModel.cs b/src/BolWallet/ViewModels/CertifyViewModel.cs
@@ -36,10 +36,14 @@ public CertifyViewModel(IBolService bolService, INavigationService navigation)
     [ObservableProperty] 
     private bool _certifyDisabled;
 
+    [ObservableProperty]
+    private bool _isCheckProcessOver;
+
     public async Task Lookup()
     {
         try
         {
+            IsCheckProcessOver = false;
             IsLoading = true;
             var alternativeCodeNames = (await _bolService.FindAlternativeCodeNames(CodeName)).ToArray();
             var alternativeAccounts = new List<BolAccount>(alternativeCodeNames.Length);
@@ -64,8 +68,9 @@ public async Task Lookup()
             IsAlternativeCertified = (AlternativeAccounts.Count > 1 &&
                                       AlternativeAccounts
                                           .Where(account => account.CodeName != CodeName)
-                                          .Any(account => account.Certifications >= 2));
+                                          .Any(account => account.Certifications > 0));
             CertifyDisabled = IsMultiCitizenship || IsAlternativeCertified;
+            IsCheckProcessOver = true;
         }
         catch (Exception ex)
         {