From 58fe8da834af6076b14f7a7f1f0137b6db0fd553 Mon Sep 17 00:00:00 2001
From: Harsh R <53080940+fullstackninja864@users.noreply.github.com>
Date: Fri, 21 Jun 2024 16:56:03 +0530
Subject: [PATCH] update(core): added mac universal build and updated release
 app names (#1307)

---
 .github/workflows/release-builds.yml | 18 +++++++++---------
 package-lock.json                    |  2 +-
 package.json                         |  6 ++++--
 webapp/package-lock.json             |  2 +-
 webapp/package.json                  |  2 +-
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/release-builds.yml b/.github/workflows/release-builds.yml
index 32b54f49..2c517c0f 100644
--- a/.github/workflows/release-builds.yml
+++ b/.github/workflows/release-builds.yml
@@ -46,7 +46,7 @@ jobs:
         with:
           repository: 'DeFiCh/app'
           tag: 'v${{ env.PACKAGE_VERSION}}'
-          file: 'DeFi-Wallet-${{ env.PACKAGE_VERSION}}.AppImage'
+          file: 'DeFi-Wallet-Linux-${{ env.PACKAGE_VERSION}}.AppImage'
 
       - name: Get Release Info with Tag Name
         id: latest_release_info
@@ -56,13 +56,13 @@ jobs:
 
       - name: Generate SHA256 checksum
         run: |
-          sha256sum DeFi-Wallet-${{ env.PACKAGE_VERSION}}.AppImage > DeFi-Wallet-${{ env.PACKAGE_VERSION}}.AppImage.SHA256
+          sha256sum DeFi-Wallet-Linux-${{ env.PACKAGE_VERSION}}.AppImage > DeFi-Wallet-Linux-${{ env.PACKAGE_VERSION}}.AppImage.SHA256
 
       - name: Upload checksum - Linux
         uses: softprops/action-gh-release@a80139913ad69754b738283897e8a1e3362b1a03
         with:
           fail_on_unmatched_files: true
-          files: ./DeFi-Wallet-${{ env.PACKAGE_VERSION}}.AppImage.SHA256
+          files: ./DeFi-Wallet-Linux-${{ env.PACKAGE_VERSION}}.AppImage.SHA256
           token: ${{ secrets.GITHUB_TOKEN }}
 
   publish_mac_version:
@@ -111,7 +111,7 @@ jobs:
         with:
           repository: 'DeFiCh/app'
           tag: 'v${{ env.PACKAGE_VERSION}}'
-          file: 'DeFi-Wallet-${{ env.PACKAGE_VERSION}}.dmg'
+          file: 'DeFi-Wallet-Mac-${{ env.PACKAGE_VERSION}}.dmg'
 
       - name: Get Release Info with Tag Name
         id: latest_release_info
@@ -121,13 +121,13 @@ jobs:
 
       - name: Generate SHA256 checksum
         run: |
-          sha256sum DeFi-Wallet-${{ env.PACKAGE_VERSION}}.dmg > DeFi-Wallet-${{ env.PACKAGE_VERSION}}.dmg.SHA256
+          sha256sum DeFi-Wallet-Mac-${{ env.PACKAGE_VERSION}}.dmg > DeFi-Wallet-Mac-${{ env.PACKAGE_VERSION}}.dmg.SHA256
 
       - name: Upload checksum - Mac
         uses: softprops/action-gh-release@a80139913ad69754b738283897e8a1e3362b1a03
         with:
           fail_on_unmatched_files: true
-          files: ./DeFi-Wallet-${{ env.PACKAGE_VERSION}}.dmg.SHA256
+          files: ./DeFi-Wallet-Mac-${{ env.PACKAGE_VERSION}}.dmg.SHA256
           token: ${{ secrets.GITHUB_TOKEN }}
 
   publish_windows_version:
@@ -169,7 +169,7 @@ jobs:
         with:
           repository: 'DeFiCh/app'
           tag: 'v${{ env.PACKAGE_VERSION}}'
-          file: 'DeFi-Wallet-Setup-${{ env.PACKAGE_VERSION}}.exe'
+          file: 'DeFi-Wallet-Windows-Setup-${{ env.PACKAGE_VERSION}}.exe'
 
       - name: Get Release Info with Tag Name
         id: latest_release_info
@@ -179,11 +179,11 @@ jobs:
 
       - name: Generate SHA256 checksum
         run: |
-          sha256sum DeFi-Wallet-Setup-${{ env.PACKAGE_VERSION}}.exe > DeFi-Wallet-Setup-${{ env.PACKAGE_VERSION}}.exe.SHA256
+          sha256sum DeFi-Wallet-Windows-Setup-${{ env.PACKAGE_VERSION}}.exe > DeFi-Wallet-Windows-Setup-${{ env.PACKAGE_VERSION}}.exe.SHA256
 
       - name: Upload checksum - Windows
         uses: softprops/action-gh-release@a80139913ad69754b738283897e8a1e3362b1a03
         with:
           fail_on_unmatched_files: true
-          files: ./DeFi-Wallet-Setup-${{ env.PACKAGE_VERSION}}.exe.SHA256
+          files: ./DeFi-Wallet-Windows-Setup-${{ env.PACKAGE_VERSION}}.exe.SHA256
           token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/package-lock.json b/package-lock.json
index 6d806425..29495dbe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "defi-wallet",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 325c7feb..0d7c93ed 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "defi-wallet",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "description": "DeFi Wallet",
   "main": "./electron-app/build/electron-app/index.js",
   "author": {
@@ -166,9 +166,11 @@
       "target": [
         {
           "target": "dmg",
-          "arch": ["x64", "arm64"]
+          "arch": ["x64", "arm64", "universal"]
         }
       ],
+      "mergeASARs": true,
+      "x64ArchFiles": "*",
       "type": "distribution",
       "hardenedRuntime": true,
       "entitlements": "electron-app/assets/entitlements.mac.plist",
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
index 82884d26..11764fb8 100644
--- a/webapp/package-lock.json
+++ b/webapp/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "defi-wallet",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/webapp/package.json b/webapp/package.json
index 23c42f51..40873dee 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "defi-wallet",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "description": "DeFi Wallet",
   "author": {
     "name": "DeFiChain Foundation",