Merge remote-tracking branch 'peps/sos-main-modal-ui' into sos-main-m…

…odal-ui
tari-project · Dec 16, 2024 · ad6cee9 · ad6cee9
2 parents 7239163 + 472e9fe
commit ad6cee9
Show file tree

Hide file tree

Showing 43 changed files with 464 additions and 350 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -34,16 +34,18 @@ jobs:
           - platform: 'ubuntu-22.04'
             args: ''
           - platform: 'windows-latest'
-            args: ''
+            args: '--bundles msi,updater'
           - platform: 'macos-latest'
             args: '--target universal-apple-darwin'
     runs-on: ${{ matrix.platform }}
     steps:
       - uses: actions/checkout@v4
+
       - name: BETA Builds - Install dependencies (windows) [yq]
         if: ${{ startsWith(runner.os,'Windows') }}
         run: |
           choco upgrade yq -y
+
       - name: BETA Builds - Install dependencies (linux) [yq]
         if: ${{ startsWith(runner.os,'Linux') }}
         shell: bash
@@ -80,6 +82,7 @@ jobs:
             -i tauri.conf.json
           cat tauri.conf.json
           sed -i.bak -e "s/\"icons\//\"beta-icons\//g" tauri.conf.json
+
       - name: RELEASE Builds - Set environment variables
         if: ${{ startsWith(github.ref, 'refs/heads/release') }}
         shell: bash
@@ -96,6 +99,7 @@ jobs:
           yq eval ".productName = \"Tari Universe\"" -i tauri.conf.json
           yq eval ".mainBinaryName = \"Tari Universe\"" -i tauri.conf.json
           yq eval ".app.windows[0].title = \"Tari Universe | Testnet\"" -i tauri.conf.json
+          yq eval ".app.windows[1].title = \"Tari Universe | Testnet\"" -i tauri.conf.json
           yq eval ".identifier = \"com.tari.universe\"" -i tauri.conf.json
           yq eval ".plugins.updater.endpoints = [\"https://raw.githubusercontent.com/tari-project/universe/main/.updater/latest.json\", \"https://cdn-universe.tari.com/tari-project/universe/updater/latest.json\"]" \
             -i tauri.conf.json
@@ -186,7 +190,7 @@ jobs:
 
       - name: Build Tauri Apps
         id: build
-        uses: tauri-apps/tauri-action@v0.5.16
+        uses: tauri-apps/tauri-action@dev
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE || secrets.AZURE_TENANT_ID }}
@@ -220,7 +224,7 @@ jobs:
           artifactPaths: ${{ steps.build.outputs.artifactPaths }}
         shell: bash
         run: |
-          echo "Artifact paths:\n ${{ join(fromJSON(steps.build.outputs.artifactPaths), '\n') }}"
+          echo -e "Artifact paths: \n${{ join(fromJSON( env.artifactPaths ), '\n') }}"
 
       - name: BETA Builds - Upload assets
         if: ${{ ( github.event_name == 'schedule' ) || ( ! startsWith(github.ref, 'refs/heads/release') ) }}

diff --git a/.gitignore b/.gitignore
@@ -26,3 +26,6 @@ src-tauri/gpu_status.json
 
 # Sentry Config File
 .env.sentry-build-plugin
+
+# Ignore hosted auto updater json files
+.updater/*.json
diff --git a/.updater/alpha-latest.json b/.updater/alpha-latest.json
@@ -1,23 +1,23 @@
 {
-    "version": "0.1.0",
+    "version": "0.8.24",
     "notes": "Tari Universe - See the assets to download this version and install",
-    "pub_date": "2024-10-01T10:21:09.614Z",
+    "pub_date": "2024-12-13T16:13:58.065Z",
     "platforms": {
         "linux-x86_64": {
-            "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGJtelJoWTkrQVpxS3NkRHZpaTgwaGc0K0ZleTEwb2RwQWlyNmRhRnNDaVBFMDI0OUhmUFEwNmtvV2dyRGRlOUlINmlERXlJNTduY2NpdU9XQytqWHdJPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI3Nzc3MzY5CWZpbGU6dGFyaS11bml2ZXJzZV8wLjUuNl9hbWQ2NC5BcHBJbWFnZS50YXIuZ3oKZEN5ODMrREZycHlEaTZqN2pQM090Uk5lWHZkMnlEWXhYUFgwSDV2bjRuaVlGWHBzMW53WHFvYXY5b2ptSUUvUkUzU0IydXp2aHVGRWtKVUpscW9PQmc9PQo=",
-            "url": "https://github.com/tari-project/universe/releases/download/v0.5.6/tari-universe_0.5.6_amd64.AppImage.tar.gz"
+            "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGRCS1A5K3c3cVlxYlFXWXgrdCt1L0s2NWcwUGJzaEZ1RXpScnpQMTM5S05va3NDcjFDWmp3TTRNYXFDb1RVSkI1eGZiNWpDUUZYZkx5NVE3aGRyQUFnPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM0MTA0MTcxCWZpbGU6VGFyaSBVbml2ZXJzZV8wLjguMjRfYW1kNjQuQXBwSW1hZ2UKL3d4aTJzMHNoeFVwdmpTMU5QV2tnY0tMM1VHaXI3L2tobXJybnVFWFJTN0JjUjlTNTFZUXVsQWx1OFA2OXNOTGFHWkFvcHBrSkMyUnk3K1ZSc0hhQUE9PQo=",
+            "url": "https://github.com/tari-project/universe/releases/download/v0.8.24/Tari.Universe_0.8.24_amd64.AppImage"
+        },
+        "windows-x86_64": {
+            "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGRRRU13V255QmZ1TnQ1YW9XeitIQjBrcE1iOHJHMEwvbXRIKzR2bHNJSUtReSt5YlJkU1lSZ3hRS21CeWJXejlHRnZJSTdjeG4wbVZBSGJoNGxVcXdvPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM0MTA1MTQ4CWZpbGU6VGFyaSBVbml2ZXJzZV8wLjguMjRfeDY0X2VuLVVTLm1zaS56aXAKQzQzcThJdkJ1Q053cmhDVnVlVEo1MnNtdWZTV2QySmc3ZTVHL0Jaakt0Qk5tY1U1L0tONGdUaGFqNzRROHBZTTlwdXJsSjhMT3lHQXNGMFVPSjdqRHc9PQo=",
+            "url": "https://github.com/tari-project/universe/releases/download/v0.8.24/Tari.Universe_0.8.24_x64_en-US.msi.zip"
         },
         "darwin-aarch64": {
-            "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFZkV2ZmdG1ZSFE1WGFPWVVSUm5SOG1Nb0hpU2ZvckZzaStEZEtsWlQ4RVQwMWRCc1l0QTFjNVNpb2x4MnJVWmtZVVJqbDlaZHVCNTE1M2t3Wkg4MkFrPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI3Nzc3NTI3CWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6CnRLU3NOT202VU5xQUNvUWgxVzRqNlNwZ3lKbUIxZ3I2Ukd2R3hianlRazcvU3docWllNmUxa01JUUNkcnUzeWxIK0xIN3RlQmJkdllCM05yTGswWUNnPT0K",
-            "url": "https://github.com/tari-project/universe/releases/download/v0.5.6/Tari.Universe_universal.app.tar.gz"
+            "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGJYNTgvNEZaVzdKMWN5akZYZDBUdXlYeUREbWtzeHdoRFdzQzMyWnpINEs1M3VQMHVVU0F5NUIrMnp5YmwwUUdReEJzLzVIbGdzMlZxaENFNktSQWdFPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM0MTA2NDA4CWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6CnM2OHdiMlphckxET0NtVDhmVUp5alR3YXpoNW1Xa3BWTERraXBIT1VzdERYbFYvOEE4NjhFOHZrVVFvbUtvZkdTeWpYeUY2bUJQQlZwTm96bEl2RER3PT0K",
+            "url": "https://github.com/tari-project/universe/releases/download/v0.8.24/Tari.Universe_universal.app.tar.gz"
         },
         "darwin-x86_64": {
-            "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFZkV2ZmdG1ZSFE1WGFPWVVSUm5SOG1Nb0hpU2ZvckZzaStEZEtsWlQ4RVQwMWRCc1l0QTFjNVNpb2x4MnJVWmtZVVJqbDlaZHVCNTE1M2t3Wkg4MkFrPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI3Nzc3NTI3CWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6CnRLU3NOT202VU5xQUNvUWgxVzRqNlNwZ3lKbUIxZ3I2Ukd2R3hianlRazcvU3docWllNmUxa01JUUNkcnUzeWxIK0xIN3RlQmJkdllCM05yTGswWUNnPT0K",
-            "url": "https://github.com/tari-project/universe/releases/download/v0.5.6/Tari.Universe_universal.app.tar.gz"
-        },
-        "windows-x86_64": {
-            "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGY5RHBGU0lPVC9vL092TzF2Z1hPNEkwUnltVEJabW1JWGpwUi9EaFN6WkJydW9HMXFQQlVGYit5dmhMemQzOXA1V3BPQlNsaEpvNEl5bnhqangwS2dFPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI3Nzc4MDY2CWZpbGU6VGFyaSBVbml2ZXJzZV8wLjUuNl94NjRfZW4tVVMubXNpLnppcApobm4yNGM2VDhlUjRibnl0THpZTEl1ajhzQm54dllwLzcxbzNVeU5UU2FmSXVpTVlCUmNrWWdZUDN6QjhVWVhDZGcrVDB2ekZPemFLdGFVOXNYMW5Cdz09Cg==",
-            "url": "https://github.com/tari-project/universe/releases/download/v0.5.6/Tari.Universe_0.5.6_x64_en-US.msi.zip"
+            "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGJYNTgvNEZaVzdKMWN5akZYZDBUdXlYeUREbWtzeHdoRFdzQzMyWnpINEs1M3VQMHVVU0F5NUIrMnp5YmwwUUdReEJzLzVIbGdzMlZxaENFNktSQWdFPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM0MTA2NDA4CWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6CnM2OHdiMlphckxET0NtVDhmVUp5alR3YXpoNW1Xa3BWTERraXBIT1VzdERYbFYvOEE4NjhFOHZrVVFvbUtvZkdTeWpYeUY2bUJQQlZwTm96bEl2RER3PT0K",
+            "url": "https://github.com/tari-project/universe/releases/download/v0.8.24/Tari.Universe_universal.app.tar.gz"
         }
     }
-}
+}
diff --git a/.updater/latest.json b/.updater/latest.json
@@ -1,23 +1,23 @@
 {
-  "version": "0.8.13",
+  "version": "0.8.14",
   "notes": "Tari Universe - See the assets to download this version and install",
-  "pub_date": "2024-12-11T17:25:53.662Z",
+  "pub_date": "2024-12-12T15:32:52.685Z",
   "platforms": {
     "linux-x86_64": {
-      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFFBMEFhODBHTDN3U01GNnBFblFWRkhSTGQ2SFkrUkZZajE4TGRpQkVNSkhLOWcvZDFFaUFtMllZbHI4dEdnWlZkWG5jZjB2bVdhWG8reU8rcVByVEFJPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzMzOTM2OTg4CWZpbGU6dGFyaS11bml2ZXJzZV8wLjguMTNfYW1kNjQuQXBwSW1hZ2UudGFyLmd6Ck13RUhsUnNhRjhrcUw3UStSSVdXSVBYS04zZW03MWJyRnIycmZVTUZjS3BuL2c0S2lsZWl6SDBsa3NpSHRqdHZCd1BuM3pHRXFGUUI4RnY5eTVVT0N3PT0K",
-      "url": "https://github.com/tari-project/universe/releases/download/v0.8.13/tari-universe_0.8.13_amd64.AppImage.tar.gz"
+      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFdxc25aNzUzc3NiY1NWelVhWkZpSCtrdFU3dlpLR0dGOGdaTVF3b0FMUXpubWFaRkNTeFN1bk5zQ0lNQzBnVWdJS1lUdlNkR3dxWGlaNDJDYkdBM0EwPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM0MDE2NTg4CWZpbGU6dGFyaS11bml2ZXJzZV8wLjguMTRfYW1kNjQuQXBwSW1hZ2UudGFyLmd6CjdieFJvcXJzanl5UGtBeVAzMXF5NlhVNktPb2F1RWliTDI0QUEzQW9VSUVVeitNQVd3VCtQL2EraHRvbU5veDhjaCs1VXJIWUlFaEMwY25LREM0TENRPT0K",
+      "url": "https://github.com/tari-project/universe/releases/download/v0.8.14/tari-universe_0.8.14_amd64.AppImage.tar.gz"
     },
     "darwin-aarch64": {
-      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGNjTEd6VjE5ZTN1RlQ2NnFHUU4rUHdxMVExMXE3QjFwL2o0SEVZVjh5Y012dzdNREcvWkIzUVprZEtkdXluRGJTYXJIb202cHVRT3BIMGF3UEF3clFBPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzMzOTM3NTg0CWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6CmhMTjdHeE1obUd2T2ZUY21Vc3BqeXJ6dnR6T0poSTJaQVI2cFZXV290RnBvU0svSi9oMlZ2S0pHbnEvV002SjZGcERnV2FuZmZUMU1zdTkxU2ZnVERnPT0K",
-      "url": "https://github.com/tari-project/universe/releases/download/v0.8.13/Tari.Universe_universal.app.tar.gz"
+      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGRXWnord2poTnQ3RnVoRkhuSjJjVTVydWhGbU1MVzh5V3dSWTNXN25BTzM5RWs1ZWMwRDBzQzh3bUwzZ3IrVWg5T3RQWml1ZWR4azg3bldqL29xVGdJPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM0MDE3MTMxCWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6Ck9LSzJDSEQ3ZFFPZ2RFa3RCaTUzT2VNUVNEN2toSUJjR1FoTmVQcjYrcFl3N3NPZmhMeUtRekFrd3p2MkIwYy84V3c3cG5ONXAzRFQvWTdMZjYxTEFnPT0K",
+      "url": "https://github.com/tari-project/universe/releases/download/v0.8.14/Tari.Universe_universal.app.tar.gz"
     },
     "darwin-x86_64": {
-      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGNjTEd6VjE5ZTN1RlQ2NnFHUU4rUHdxMVExMXE3QjFwL2o0SEVZVjh5Y012dzdNREcvWkIzUVprZEtkdXluRGJTYXJIb202cHVRT3BIMGF3UEF3clFBPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzMzOTM3NTg0CWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6CmhMTjdHeE1obUd2T2ZUY21Vc3BqeXJ6dnR6T0poSTJaQVI2cFZXV290RnBvU0svSi9oMlZ2S0pHbnEvV002SjZGcERnV2FuZmZUMU1zdTkxU2ZnVERnPT0K",
-      "url": "https://github.com/tari-project/universe/releases/download/v0.8.13/Tari.Universe_universal.app.tar.gz"
+      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGRXWnord2poTnQ3RnVoRkhuSjJjVTVydWhGbU1MVzh5V3dSWTNXN25BTzM5RWs1ZWMwRDBzQzh3bUwzZ3IrVWg5T3RQWml1ZWR4azg3bldqL29xVGdJPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM0MDE3MTMxCWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6Ck9LSzJDSEQ3ZFFPZ2RFa3RCaTUzT2VNUVNEN2toSUJjR1FoTmVQcjYrcFl3N3NPZmhMeUtRekFrd3p2MkIwYy84V3c3cG5ONXAzRFQvWTdMZjYxTEFnPT0K",
+      "url": "https://github.com/tari-project/universe/releases/download/v0.8.14/Tari.Universe_universal.app.tar.gz"
     },
     "windows-x86_64": {
-      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFlyQlhhSkRGaFM4dzF2YTYzSjhTK1pETHlUeDlQTDhQd051RzF4NDVHcmJuY05lN2cwUFJqMjdvUFRFaXBHc05Cblh6V2NaMEc0Yjd4L1A3bVk4cmc4PQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzMzOTM3OTQ3CWZpbGU6VGFyaSBVbml2ZXJzZV8wLjguMTNfeDY0X2VuLVVTLm1zaS56aXAKaFVpMGZPemh6SXFXbmdKQzdsZUJpcWpwUVdBcGJkMjZVRCtuZ2Z6Njh6Qi9ZazE0cU1IMDg2MlVXbC9ncXU1M2F3RjJNZUVvRlpjZFBta201NnJPRFE9PQo=",
-      "url": "https://github.com/tari-project/universe/releases/download/v0.8.13/Tari.Universe_0.8.13_x64_en-US.msi.zip"
+      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGVYcmZGWmV2cWZndkJTeDJDcWwxNmJLVFkrbTJueTgxTU11SlpDZytKd1lTZUJXMDRkL0k3UElpdWZiMW0wR3JGS0dnL2pTNjU5R243TWF2STlZU2dzPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM0MDE3NTY3CWZpbGU6VGFyaSBVbml2ZXJzZV8wLjguMTRfeDY0X2VuLVVTLm1zaS56aXAKWVVReWR1cFQ0N0thTmlybllVT1VxcWxjN3dQK3NNamFEZFdpamN4Yk5mKzNPRFZkc21kYVNweG1IWXdpb0cveHpsR01rV1VWRlg3NThwUitrL25zQkE9PQo=",
+      "url": "https://github.com/tari-project/universe/releases/download/v0.8.14/Tari.Universe_0.8.14_x64_en-US.msi.zip"
     }
   }
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "tari-universe",
     "private": true,
-    "version": "0.8.11",
+    "version": "0.8.24",
     "type": "module",
     "scripts": {
         "dev": "vite dev --mode development",