Merge pull request #5635 from bithyve/sprint

Release v1.2.20
bithyve · Nov 25, 2024 · e1fa00b · e1fa00b
2 parents 308f522 + 7fd1a7a
commit e1fa00b
Show file tree

Hide file tree

Showing 232 changed files with 5,087 additions and 3,284 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -86,8 +86,8 @@ android {
         applicationId "io.hexawallet.keeper"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 415
-        versionName "1.2.19"
+        versionCode 421
+        versionName "1.2.20"
         missingDimensionStrategy 'react-native-camera', 'general'
         missingDimensionStrategy 'store', 'play'
         multiDexEnabled true

diff --git a/android/app/src/main/assets/fonts/FiraSans-Bold.ttf b/android/app/src/main/assets/fonts/FiraSans-Bold.ttf
diff --git a/android/app/src/main/assets/fonts/FiraSans-BoldItalic.ttf b/android/app/src/main/assets/fonts/FiraSans-BoldItalic.ttf
diff --git a/android/app/src/main/assets/fonts/FiraSans-Italic.ttf b/android/app/src/main/assets/fonts/FiraSans-Italic.ttf
diff --git a/android/app/src/main/assets/fonts/FiraSans-Light.ttf b/android/app/src/main/assets/fonts/FiraSans-Light.ttf
diff --git a/android/app/src/main/assets/fonts/FiraSans-LightItalic.ttf b/android/app/src/main/assets/fonts/FiraSans-LightItalic.ttf
diff --git a/android/app/src/main/assets/fonts/FiraSans-Medium.ttf b/android/app/src/main/assets/fonts/FiraSans-Medium.ttf
diff --git a/android/app/src/main/assets/fonts/FiraSans-MediumItalic.ttf b/android/app/src/main/assets/fonts/FiraSans-MediumItalic.ttf
diff --git a/android/app/src/main/assets/fonts/FiraSans-Regular.ttf b/android/app/src/main/assets/fonts/FiraSans-Regular.ttf
diff --git a/android/app/src/main/assets/fonts/FiraSans-SemiBold.ttf b/android/app/src/main/assets/fonts/FiraSans-SemiBold.ttf
diff --git a/android/app/src/main/assets/fonts/FiraSans-SemiBoldItalic.ttf b/android/app/src/main/assets/fonts/FiraSans-SemiBoldItalic.ttf
diff --git a/android/app/src/main/assets/fonts/Inter-Bold.ttf b/android/app/src/main/assets/fonts/Inter-Bold.ttf
diff --git a/android/app/src/main/assets/fonts/Inter-BoldItalic.ttf b/android/app/src/main/assets/fonts/Inter-BoldItalic.ttf
diff --git a/android/app/src/main/assets/fonts/Inter-Italic.ttf b/android/app/src/main/assets/fonts/Inter-Italic.ttf
diff --git a/android/app/src/main/assets/fonts/Inter-Light.ttf b/android/app/src/main/assets/fonts/Inter-Light.ttf
diff --git a/android/app/src/main/assets/fonts/Inter-LightItalic.ttf b/android/app/src/main/assets/fonts/Inter-LightItalic.ttf
diff --git a/android/app/src/main/assets/fonts/Inter-Medium.ttf b/android/app/src/main/assets/fonts/Inter-Medium.ttf
diff --git a/android/app/src/main/assets/fonts/Inter-MediumItalic.ttf b/android/app/src/main/assets/fonts/Inter-MediumItalic.ttf
diff --git a/android/app/src/main/assets/fonts/Inter-Regular.ttf b/android/app/src/main/assets/fonts/Inter-Regular.ttf
diff --git a/android/app/src/main/assets/fonts/Inter-SemiBold.ttf b/android/app/src/main/assets/fonts/Inter-SemiBold.ttf
diff --git a/android/app/src/main/assets/fonts/Inter-SemiBoldItalic.ttf b/android/app/src/main/assets/fonts/Inter-SemiBoldItalic.ttf
diff --git a/android/app/src/main/java/com/hexa_keeper/CloudBackupModule.kt b/android/app/src/main/java/com/hexa_keeper/CloudBackupModule.kt
@@ -157,7 +157,7 @@ class CloudBackupModule(reactContext: ReactApplicationContext) : ReactContextBas
             )
 
             val assetManager = reactApplicationContext.assets
-            val fontStream = assetManager.open("fonts/FiraSans-Regular.ttf")
+            val fontStream = assetManager.open("fonts/Inter-Regular.ttf")
 
             val byteArrayOutputStream = ByteArrayOutputStream()
             fontStream.use { input ->
@@ -166,9 +166,9 @@ class CloudBackupModule(reactContext: ReactApplicationContext) : ReactContextBas
                 }
             }
             val fontBytes = byteArrayOutputStream.toByteArray()
-            val firaSansRegular =  BaseFont.createFont("FiraSans-Regular.ttf", BaseFont.IDENTITY_H, BaseFont.EMBEDDED, true, fontBytes, null)
+            val interRegular = BaseFont.createFont("Inter-Regular.ttf", BaseFont.IDENTITY_H, BaseFont.EMBEDDED, true, fontBytes, null)
 
-            val defaultFont = Font(firaSansRegular, 13f, Font.NORMAL)
+           val defaultFont = Font(interRegular, 13f, Font.NORMAL)
             val document = Document(PageSize.A4)
             val pdfWriter = PdfWriter.getInstance(document, FileOutputStream(File(file.path)))
             pdfWriter.setEncryption(
@@ -190,7 +190,7 @@ class CloudBackupModule(reactContext: ReactApplicationContext) : ReactContextBas
             // Align image to center
             image.alignment = Element.ALIGN_CENTER
             document.add(image)
-            val header = Paragraph("Your Wallet Configurations",  Font(firaSansRegular, 24f, Font.NORMAL))
+            val header = Paragraph("Your Wallet Configurations", Font(interRegular, 24f, Font.BOLD))
             header.alignment = Element.ALIGN_CENTER
             header.spacingBefore = padding
             header.spacingAfter = padding
@@ -227,7 +227,7 @@ class CloudBackupModule(reactContext: ReactApplicationContext) : ReactContextBas
                 preface.add(Paragraph("----------------------------------------------------------------------------------------------------------------------"));
                 preface.add(Paragraph(content, defaultFont))
                 preface.add(Paragraph("----------------------------------------------------------------------------------------------------------------------"));
-                preface.add(Paragraph("File Details: File created on: $formattedDateTime",  Font(firaSansRegular, 13f, Font.NORMAL)));
+                preface.add(Paragraph("File Details: File created on: $formattedDateTime", Font(interRegular, 13f, Font.NORMAL)))
                 preface.add(Paragraph(" "));
                 preface.add(Paragraph("Wallet Configuration QR: ",  defaultFont));
                 preface.add(Paragraph(" "));

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -42,7 +42,7 @@ MYAPP_RELEASE_STORE_FILE=keeper-release-key.keystore
 MYAPP_RELEASE_KEY_ALIAS=keeper-key-alias
 MYAPP_RELEASE_STORE_PASSWORD=keeper
 MYAPP_RELEASE_KEY_PASSWORD=keeper
-org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=2048m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=2048m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # Use this property to enable or disable the Hermes JS engine.
 # If set to false, you will be using JSC instead.

diff --git a/android/link-assets-manifest.json b/android/link-assets-manifest.json
@@ -2,44 +2,44 @@
   "migIndex": 1,
   "data": [
     {
-      "path": "src/assets/fonts/FiraSans-Bold.ttf",
-      "sha1": "bdb04cd9e835a3cf7ba22df0354f1472812df225"
+      "path": "src/assets/fonts/Inter-Bold.ttf",
+      "sha1": "327abbf74a5d71ffa8d888d976234cb11dabf194"
     },
     {
-      "path": "src/assets/fonts/FiraSans-BoldItalic.ttf",
-      "sha1": "64ca0c2a17bc89e3e274ab93d0a34ccf557ed5ee"
+      "path": "src/assets/fonts/Inter-BoldItalic.ttf",
+      "sha1": "d21df542bbfae3929961311bd4cd72480185b285"
     },
     {
-      "path": "src/assets/fonts/FiraSans-Italic.ttf",
-      "sha1": "c584552cccc716eb287a95a23806be746f3cad73"
+      "path": "src/assets/fonts/Inter-Italic.ttf",
+      "sha1": "ec36f0b6431e16cae9c11f93832eae6dbad40b4a"
     },
     {
-      "path": "src/assets/fonts/FiraSans-Light.ttf",
-      "sha1": "d795fdfc99d1bad2c0e42eea5a9f06e49dd67b1b"
+      "path": "src/assets/fonts/Inter-Light.ttf",
+      "sha1": "6b041e6fc61656b930d8ef638a0b9d6a0ac8e084"
     },
     {
-      "path": "src/assets/fonts/FiraSans-LightItalic.ttf",
-      "sha1": "26d80b11b6b24499165341bce66c05126623052e"
+      "path": "src/assets/fonts/Inter-LightItalic.ttf",
+      "sha1": "c896e4309f43e88093e058a6b822692d43120a18"
     },
     {
-      "path": "src/assets/fonts/FiraSans-Medium.ttf",
-      "sha1": "9181432d76711ae510c9f20713465810cf09e63b"
+      "path": "src/assets/fonts/Inter-Medium.ttf",
+      "sha1": "e2d21cdc9730ce4d4bdccb3476413a5b79fe7d52"
     },
     {
-      "path": "src/assets/fonts/FiraSans-MediumItalic.ttf",
-      "sha1": "70985253068fcdd4774f198c6098c5f4946e548e"
+      "path": "src/assets/fonts/Inter-MediumItalic.ttf",
+      "sha1": "be7237b6cdcd5738007a1fb702309e23bdfd7125"
     },
     {
-      "path": "src/assets/fonts/FiraSans-Regular.ttf",
-      "sha1": "9647e8c14e6618517f6942fbada0a01e2c18973d"
+      "path": "src/assets/fonts/Inter-Regular.ttf",
+      "sha1": "bd1976c1f019853ab6143ef1246e25aa66fd990e"
     },
     {
-      "path": "src/assets/fonts/FiraSans-SemiBold.ttf",
-      "sha1": "7d6bc4d8ea78656ca2f234e41f0e74e676ad61e2"
+      "path": "src/assets/fonts/Inter-SemiBold.ttf",
+      "sha1": "ee81756dc9685877077aae9027708aa84bc56027"
     },
     {
-      "path": "src/assets/fonts/FiraSans-SemiBoldItalic.ttf",
-      "sha1": "925d03ef5fb51987cd0405f7cb717456ef24854a"
+      "path": "src/assets/fonts/Inter-SemiBoldItalic.ttf",
+      "sha1": "f317395eca6c7b5c6c4e5fcf7f74c277215ae719"
     }
   ]
 }
diff --git a/ios/cloudbackup/CloudBackupHelper.swift b/ios/cloudbackup/CloudBackupHelper.swift
@@ -192,4 +192,41 @@ import QRCoder
       }
       return ""
   }
+
+  @objc func bsmsHealthCheck(callback: @escaping ((String)-> Void)) {
+    // First check cloud storage
+    guard let iCloudFolderURL = getICloudFolder(named: "BitcoinKeeper") else {
+        let response = getJsonResponse(
+            status: false,
+            data: "",
+            error: "iCloud is currently inaccessible. Please check authentication with your iCloud and try again."
+        )
+        callback(response)
+        return
+    }
+
+    // Check files in iCloud
+    do {
+        let fileManager = FileManager.default
+        let files = try fileManager.contentsOfDirectory(
+            at: iCloudFolderURL, 
+            includingPropertiesForKeys: nil
+        )
+
+        let response = getJsonResponse(
+            status: true,
+            data: "Found \(files.count) files",
+            error: ""
+        )
+        callback(response)
+
+    } catch {
+        let response = getJsonResponse(
+            status: false,
+            data: "",
+            error: error.localizedDescription
+        )
+        callback(response)
+    }
+  }
 }
diff --git a/ios/cloudbackup/cloudbackup.m b/ios/cloudbackup/cloudbackup.m
@@ -20,11 +20,12 @@ @implementation CloudBackup
     }];
 }
 
-RCT_EXPORT_METHOD(bsmsHealthCheck:(NSString *)data
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject){
-  CloudBackupHelper *helper = [[CloudBackupHelper alloc]init];
-
+RCT_EXPORT_METHOD(bsmsHealthCheck:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject) {
+    CloudBackupHelper *helper = [[CloudBackupHelper alloc]init];
+    [helper bsmsHealthCheckWithCallback:^(NSString * _Nonnull response) {
+        resolve(response);
+    }];
 }