merges

.github/workflows/release.yml

@@ -194,7 +194,7 @@ jobs:
 
       - name: Build Tauri apps
         id: build
-        uses: tauri-apps/[email protected].14
+        uses: tauri-apps/[email protected].15
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE || secrets.AZURE_TENANT_ID }}

.updater/latest.json

@@ -1,23 +1,23 @@
 {
-  "version": "0.5.22",
+  "version": "0.5.42",
   "notes": "Tari Universe - See the assets to download this version and install",
-  "pub_date": "2024-10-14T16:29:37.539Z",
+  "pub_date": "2024-10-21T18:58:38.863Z",
   "platforms": {
     "linux-x86_64": {
-      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFVaMU1HRTRHMHBQWEtJb2hYVUU1dFMzWFArWVVRYnFRYjVnNnFIWDhIVVZlTjlIRWpkWTduUlQrZ2IxRENuQ2ppekUzNHlkeERmNXI3QmNscUNxWHdBPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI4OTIzMzYyCWZpbGU6dGFyaS11bml2ZXJzZV8wLjUuMjJfYW1kNjQuQXBwSW1hZ2UudGFyLmd6CmwrL29nb2U3cVhUTzhrczZ5YlNLd2YvWG1neEI4eFQwS28ybWIwdmFjM240WXNpc3FiSTJiNFlBNDNIdnUvb0FqbU9pUnB0RnI1Z0pERzlvWmhoN0RRPT0K",
-      "url": "https://github.com/tari-project/universe/releases/download/v0.5.22/tari-universe_0.5.22_amd64.AppImage.tar.gz"
+      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGNoeGlqK2IvMjNpOFFEeDlrV3AwU01ZdGpRSGtwczFaV2dnbURmdnEydmMvQzA1c1hhUms3QUZLdDQvenVRcE15elhGNEIwY3hkUUpITTk4UWdEM2djPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI5NTM1OTEzCWZpbGU6dGFyaS11bml2ZXJzZV8wLjUuNDJfYW1kNjQuQXBwSW1hZ2UudGFyLmd6CnZzdjl2Ym8wYnRDSWptZjh5UlRtV1F0Mll1MFZENHN0SkptTE5pRFFwa3Btc21veE5NV213UnpqU1B0NytWL1IzT1ZkVEcwSml5QnVHd3BpcmQ2M0NRPT0K",
+      "url": "https://github.com/tari-project/universe/releases/download/v0.5.42/tari-universe_0.5.42_amd64.AppImage.tar.gz"
     },
     "darwin-aarch64": {
-      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFZNR0FuT2NtQkY0Y3NMaHFEaDQyNktNV3NHcHNzaDJPVk8rdEtLRDlLeHZDdHhjVnlZSitTN2x4aDJEK1FjVG0zcUhuS1JNeTAzNlBudy9UM0R0L0FZPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI4OTIxOTIzCWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6Ckw5eGpaL0tVZGU3b3RHcExYbGJrcEl4bkR2WjUxNVltWWFqekg1TFpwY0ExRWxoMy9CRzdXWjRnNEN2SHlYRjhyQk9jaC9seEdXWjd1YnMvSUpYK0N3PT0K",
-      "url": "https://github.com/tari-project/universe/releases/download/v0.5.22/Tari.Universe_universal.app.tar.gz"
+      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGRUWXFCL3VDcWsrcENUUTVqdHkyeDhhbjlwVjcyazF5NnVHUWQ5SzRtV2JTNStkZmlNMkxlZnFaakJaclpTSHVOVGdONGVMaFZ3Y2NRd0g4Q2xldWdZPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI5NTM2MzM1CWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6Ck1ldE9hRG9xSmpyZ3dxNGl0MTJDcllVeGhiSm5rYVZMWmIyOEVidDVJSXI2bjZCZnFpbW1ONzdoc1lhNG00aEt5cEVaUnQ2UFYrNXN5Ung4MkdpckRRPT0K",
+      "url": "https://github.com/tari-project/universe/releases/download/v0.5.42/Tari.Universe_universal.app.tar.gz"
     },
     "darwin-x86_64": {
-      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFZNR0FuT2NtQkY0Y3NMaHFEaDQyNktNV3NHcHNzaDJPVk8rdEtLRDlLeHZDdHhjVnlZSitTN2x4aDJEK1FjVG0zcUhuS1JNeTAzNlBudy9UM0R0L0FZPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI4OTIxOTIzCWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6Ckw5eGpaL0tVZGU3b3RHcExYbGJrcEl4bkR2WjUxNVltWWFqekg1TFpwY0ExRWxoMy9CRzdXWjRnNEN2SHlYRjhyQk9jaC9seEdXWjd1YnMvSUpYK0N3PT0K",
-      "url": "https://github.com/tari-project/universe/releases/download/v0.5.22/Tari.Universe_universal.app.tar.gz"
+      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGRUWXFCL3VDcWsrcENUUTVqdHkyeDhhbjlwVjcyazF5NnVHUWQ5SzRtV2JTNStkZmlNMkxlZnFaakJaclpTSHVOVGdONGVMaFZ3Y2NRd0g4Q2xldWdZPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI5NTM2MzM1CWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6Ck1ldE9hRG9xSmpyZ3dxNGl0MTJDcllVeGhiSm5rYVZMWmIyOEVidDVJSXI2bjZCZnFpbW1ONzdoc1lhNG00aEt5cEVaUnQ2UFYrNXN5Ung4MkdpckRRPT0K",
+      "url": "https://github.com/tari-project/universe/releases/download/v0.5.42/Tari.Universe_universal.app.tar.gz"
     },
     "windows-x86_64": {
-      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFEvMndBeHVwSnZMY3NSekcvcVZxOTlVRkh3TFFGVzhFVW92eXB1SlE2amwxdGQ2WnNVRTFUdTB1dEQ4b1BZRzMyZ283MDU1by9Zdm96Z3dmN2U4dHdzPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI4OTIyNTI4CWZpbGU6VGFyaSBVbml2ZXJzZV8wLjUuMjJfeDY0X2VuLVVTLm1zaS56aXAKcDdSdWt4a1paWE0vL3d4TkNVVkJ2czFaSk9aQlZHd2xoMkZYd29ldGhhNHJ6MUE0ZnMzeldrakFxbndwQnVlZHgyZytHKzNlMEJjR2Y1NHppMzUvRHc9PQo=",
-      "url": "https://github.com/tari-project/universe/releases/download/v0.5.22/Tari.Universe_0.5.22_x64_en-US.msi.zip"
+      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFJoVWNmb3dhSTF4MEpVcnB1aUZUdTl2bHNMRmxBcHFSVkMvM3ZKQ21EdSthQm9qTG9pcWc3R1h0bTg2YjYweTBuR0FWakZ3bEtLcXRTTlQrQnBlTlFnPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI5NTM3MTE1CWZpbGU6VGFyaSBVbml2ZXJzZV8wLjUuNDJfeDY0X2VuLVVTLm1zaS56aXAKcXhOV2dmMGZIQTArUHJ1dWZvcW9Sd0tpNW1xdWhMeU14OVU0RHpOUkJSd3NPWjBYT2VzZXpFdjNiaGJPTk5wMGRYN3podmgwOEZrNDFpL2R2SysxQkE9PQo=",
+      "url": "https://github.com/tari-project/universe/releases/download/v0.5.42/Tari.Universe_0.5.42_x64_en-US.msi.zip"
     }
   }
 }

eslint.config.js

@@ -2,6 +2,7 @@ import eslint from '@eslint/js';
 import tseslint from 'typescript-eslint';
 import react from 'eslint-plugin-react';
 import hooksPlugin from 'eslint-plugin-react-hooks';
+import i18next from 'eslint-plugin-i18next';
 
 import prettierConfig from 'eslint-config-prettier';
 import prettierPluginConfig from 'eslint-plugin-prettier/recommended';
@@ -30,7 +31,7 @@ export default [
         },
         files: ['src/**/*.{js,ts,jsx,tsx}'],
         ignores: ['./**/*.config.{js,ts}'],
-        plugins: { react, 'react-hooks': hooksPlugin },
+        plugins: { react, 'react-hooks': hooksPlugin, i18next },
         rules: {
             ...react.configs.recommended.rules,
             ...hooksPlugin.configs.recommended.rules,
@@ -51,6 +52,7 @@ export default [
             'react/prop-types': 'off',
             'react/jsx-uses-react': 'off',
             'react/react-in-jsx-scope': 'off',
+            'i18next/no-literal-string': ['error', { markupOnly: true }],
         },
     },
 ];

package.json

@@ -1,7 +1,7 @@
 {
     "name": "tari-universe",
     "private": true,
-    "version": "0.5.22",
+    "version": "0.5.42",
     "type": "module",
     "scripts": {
         "dev": "vite dev --mode development",
@@ -27,6 +27,7 @@
         "react-hook-form": "^7.52.2",
         "react-i18next": "^15.0.3",
         "react-icons": "^5.3.0",
+        "socket.io-client": "^4.8.0",
         "styled-components": "^6.1.12",
         "uuid": "^10.0.0",
         "vite-tsconfig-paths": "^5.0.1",
@@ -46,13 +47,15 @@
         "babel-plugin-styled-components": "^2.1.4",
         "eslint": "^9.12.0",
         "eslint-config-prettier": "^9.1.0",
+        "eslint-plugin-i18next": "^6.1.0",
         "eslint-plugin-prettier": "^5.2.1",
         "eslint-plugin-react": "^7.37.1",
         "eslint-plugin-react-hooks": "^5.0.0",
         "prettier": "3.3.3",
         "prettier-eslint": "^16.3.0",
+        "react-qr-code": "^2.0.15",
         "typescript": "^5.6.3",
         "typescript-eslint": "^8.8.1",
         "vite": "^5.4.9"
     }
-}
+}

public/locales/af/airdrop.json

@@ -30,5 +30,9 @@
   "topTooltipTitle": "Testnet Belonings",
   "claimModalFinePrint": "<strong>Neem asseblief kennis:</strong> die eis van edelstene skakel analise aan sodat ons Universe kan verbeter",
   "inviteFriendsText": "Kopieer skakel en deel dit",
-  "logged-in-as": "Aangemeld as <strong>@{{twitter}}</strong>"
+  "logged-in-as": "Aangemeld as <strong>@{{twitter}}</strong>",
+  "bonus-gems-earned": "Bonus gems earned",
+  "keep-mining-to-earn-rewards": "Keep mining to earn more rewards!",
+  "your-friend-accepted-gift": "One of your friends accepted your gift!",
+  "you-reached-your-giftinh-goal": "You reached your gifting goal!"
 }

public/locales/af/mining-view.json

@@ -12,5 +12,8 @@
     "waiting-for-idle": "Wag tot onaktief",
     "started-auto-mining": "Outomatiese myn het begin",
     "stop-mining": "Stop Mynbou"
-  }
+  },
+  "estimated-earnings": "Estimated earnings",
+  "you-earn-rewards-separately": "You earn rewards for mining CPU and GPU separately",
+  "day": "day"
 }

public/locales/af/settings.json

@@ -1,5 +1,6 @@
 {
   "settings": "Instellings",
+  "tari-wallet-address": "Tari Wallet Address",
   "seed-words": "Saadwoorde",
   "change-language": "Verander taal",
   "logs": "Verslae",
@@ -20,6 +21,18 @@
   "reset-settings": "Stel Instellings Terug",
   "reset-permanently": "Is jy seker jy wil alle instellings permanent terugstel?",
   "reset-wallet": "Stel beursie terug",
+  "mine-on-app-start": {
+      "title": "Mining on startup",
+    "description": "When enabled, the app will start mining automatically when it is launched."
+  },
+  "should-auto-start": {
+    "title": "Auto-start on system boot",
+    "description": "When enabled, the app will start automatically when you log in to your computer."
+  },
+  "use-auto-update": {
+    "title": "Update Tari Universe automatically",
+    "description": "When enabled, the app will check for updates and install them automatically."
+  },
   "connected-to-tari": "Gekoppel aan die Tari Netwerk",
   "not-connected-to-tari": "Nie aan die Tari Netwerk gekoppel nie",
   "connected-peers": "Gekoppelde Eweknieë",
@@ -63,5 +76,13 @@
   "invalid-seed-words": "Voer 24 woorde in, geskei deur spasies",
   "yes": "Yes",
   "cancel": "Cancel",
-  "report-issue": "Rapporteer \"n probleem"
+  "report-issue": "Rapporteer \"n probleem",
+  "app-restart-required": "App restart required",
+  "setup-tor-settings": "Setup Tor Settings for Privacy Control and Connectivity",
+  "control-port": "Control Port",
+  "save": "Save",
+  "errors": {
+      "invalid-control-port": "Control Port configuration is invalid",
+      "invalid-bridge": "Bridge configuration is invalid"
+  }
 }

public/locales/af/setup-view.json

@@ -23,6 +23,7 @@
   },
   "new-tari-version-available": "'n Nuwe weergawe van Tari Universe is beskikbaar",
   "would-you-like-to-install": "Wil jy nou Tari Universe {{version}} installeer?",
+  "installing-latest-version": "Installing {{version}} version of Tari Universe",
   "yes": "Ja",
   "no": "Nee"
 }