Release 1.26.0 (#1194)

Merge pull request #1194 from madfish-solutions/development
madfish-solutions · Sep 9, 2024 · 766eb0d · 766eb0d
2 parents 90beabb + dd062d9
commit 766eb0d
Show file tree

Hide file tree

Showing 87 changed files with 1,451 additions and 581 deletions.
diff --git a/.env.dist b/.env.dist
@@ -38,4 +38,16 @@ PERSONA_ADS_MEDIUM_BANNER_UNIT_ID=
 PERSONA_ADS_MISES_SQUARISH_BANNER_UNIT_ID=
 PERSONA_ADS_SQUARISH_BANNER_UNIT_ID=
 
+SMARTY_300_250_PLACEMENT_ID=
+SMARTY_320_50_PLACEMENT_ID=
+SMARTY_728_90_PLACEMENT_ID=
+SMARTY_970_90_PLACEMENT_ID=
+SMARTY_336_280_PLACEMENT_ID=
+SMARTY_160_600_PLACEMENT_ID=
+SMARTY_970_250_PLACEMENT_ID=
+SMARTY_320_100_PLACEMENT_ID=
+SMARTY_300_600_PLACEMENT_ID=
+
 TEMPLE_ADS_ORIGIN_PASSPHRASE=
+
+TAKE_ADS_TOKEN=
diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml
@@ -57,7 +57,17 @@ jobs:
           PERSONA_ADS_MEDIUM_BANNER_UNIT_ID: ${{ vars.PERSONA_ADS_MEDIUM_BANNER_UNIT_ID }}
           PERSONA_ADS_MISES_SQUARISH_BANNER_UNIT_ID: ${{ vars.PERSONA_ADS_MISES_SQUARISH_BANNER_UNIT_ID }}
           PERSONA_ADS_SQUARISH_BANNER_UNIT_ID: ${{ vars.PERSONA_ADS_SQUARISH_BANNER_UNIT_ID }}
+          SMARTY_300_250_PLACEMENT_ID: ${{ vars.SMARTY_300_250_PLACEMENT_ID }}
+          SMARTY_320_50_PLACEMENT_ID: ${{ vars.SMARTY_320_50_PLACEMENT_ID }}
+          SMARTY_728_90_PLACEMENT_ID: ${{ vars.SMARTY_728_90_PLACEMENT_ID }}
+          SMARTY_970_90_PLACEMENT_ID: ${{ vars.SMARTY_970_90_PLACEMENT_ID }}
+          SMARTY_336_280_PLACEMENT_ID: ${{ vars.SMARTY_336_280_PLACEMENT_ID }}
+          SMARTY_160_600_PLACEMENT_ID: ${{ vars.SMARTY_160_600_PLACEMENT_ID }}
+          SMARTY_970_250_PLACEMENT_ID: ${{ vars.SMARTY_970_250_PLACEMENT_ID }}
+          SMARTY_320_100_PLACEMENT_ID: ${{ vars.SMARTY_320_100_PLACEMENT_ID }}
+          SMARTY_300_600_PLACEMENT_ID: ${{ vars.SMARTY_300_600_PLACEMENT_ID }}
           TEMPLE_ADS_ORIGIN_PASSPHRASE: ${{ vars.TEMPLE_ADS_ORIGIN_PASSPHRASE }}
+          TAKE_ADS_TOKEN: ${{ secrets.TAKE_ADS_TOKEN }}
           CONVERSION_VERIFICATION_URL: ${{ vars.CONVERSION_VERIFICATION_URL }}
 
       - name: Install dependencies and code quality check with private modules
@@ -69,7 +79,7 @@ jobs:
         run: yarn build:chrome
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: chrome
           path: dist/chrome.zip
@@ -89,7 +99,7 @@ jobs:
         run: yarn build:chrome:core
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: chrome_core
           path: dist/chrome.zip

diff --git a/.github/workflows/manual-builds.yml b/.github/workflows/manual-builds.yml
@@ -75,7 +75,17 @@ jobs:
           PERSONA_ADS_MEDIUM_BANNER_UNIT_ID: ${{ vars.PERSONA_ADS_MEDIUM_BANNER_UNIT_ID }}
           PERSONA_ADS_MISES_SQUARISH_BANNER_UNIT_ID: ${{ vars.PERSONA_ADS_MISES_SQUARISH_BANNER_UNIT_ID }}
           PERSONA_ADS_SQUARISH_BANNER_UNIT_ID: ${{ vars.PERSONA_ADS_SQUARISH_BANNER_UNIT_ID }}
+          SMARTY_300_250_PLACEMENT_ID: ${{ vars.SMARTY_300_250_PLACEMENT_ID }}
+          SMARTY_320_50_PLACEMENT_ID: ${{ vars.SMARTY_320_50_PLACEMENT_ID }}
+          SMARTY_728_90_PLACEMENT_ID: ${{ vars.SMARTY_728_90_PLACEMENT_ID }}
+          SMARTY_970_90_PLACEMENT_ID: ${{ vars.SMARTY_970_90_PLACEMENT_ID }}
+          SMARTY_336_280_PLACEMENT_ID: ${{ vars.SMARTY_336_280_PLACEMENT_ID }}
+          SMARTY_160_600_PLACEMENT_ID: ${{ vars.SMARTY_160_600_PLACEMENT_ID }}
+          SMARTY_970_250_PLACEMENT_ID: ${{ vars.SMARTY_970_250_PLACEMENT_ID }}
+          SMARTY_320_100_PLACEMENT_ID: ${{ vars.SMARTY_320_100_PLACEMENT_ID }}
+          SMARTY_300_600_PLACEMENT_ID: ${{ vars.SMARTY_300_600_PLACEMENT_ID }}
           TEMPLE_ADS_ORIGIN_PASSPHRASE: ${{ vars.TEMPLE_ADS_ORIGIN_PASSPHRASE }}
+          TAKE_ADS_TOKEN: ${{ secrets.TAKE_ADS_TOKEN }}
           CONVERSION_VERIFICATION_URL: ${{ vars.CONVERSION_VERIFICATION_URL }}
           # [e2e]
           DEFAULT_HD_ACCOUNT_SEED_PHRASE: ${{ secrets.DEFAULT_HD_ACCOUNT_SEED_PHRASE }}
@@ -115,7 +125,7 @@ jobs:
 
       - name: Upload Chrome artifact
         if: ${{ github.event.inputs.chrome == 'true' || github.event.inputs.chromePlusE2E == 'true' }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: chrome
           path: dist/chrome.zip
@@ -147,7 +157,7 @@ jobs:
 
       - name: Upload Firefox artifact
         if: ${{ github.event.inputs.firefox == 'true' }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: firefox
           path: dist/firefox.xpi

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -57,7 +57,17 @@ jobs:
           PERSONA_ADS_MEDIUM_BANNER_UNIT_ID: ${{ vars.PERSONA_ADS_MEDIUM_BANNER_UNIT_ID }}
           PERSONA_ADS_MISES_SQUARISH_BANNER_UNIT_ID: ${{ vars.PERSONA_ADS_MISES_SQUARISH_BANNER_UNIT_ID }}
           PERSONA_ADS_SQUARISH_BANNER_UNIT_ID: ${{ vars.PERSONA_ADS_SQUARISH_BANNER_UNIT_ID }}
+          SMARTY_300_250_PLACEMENT_ID: ${{ vars.SMARTY_300_250_PLACEMENT_ID }}
+          SMARTY_320_50_PLACEMENT_ID: ${{ vars.SMARTY_320_50_PLACEMENT_ID }}
+          SMARTY_728_90_PLACEMENT_ID: ${{ vars.SMARTY_728_90_PLACEMENT_ID }}
+          SMARTY_970_90_PLACEMENT_ID: ${{ vars.SMARTY_970_90_PLACEMENT_ID }}
+          SMARTY_336_280_PLACEMENT_ID: ${{ vars.SMARTY_336_280_PLACEMENT_ID }}
+          SMARTY_160_600_PLACEMENT_ID: ${{ vars.SMARTY_160_600_PLACEMENT_ID }}
+          SMARTY_970_250_PLACEMENT_ID: ${{ vars.SMARTY_970_250_PLACEMENT_ID }}
+          SMARTY_320_100_PLACEMENT_ID: ${{ vars.SMARTY_320_100_PLACEMENT_ID }}
+          SMARTY_300_600_PLACEMENT_ID: ${{ vars.SMARTY_300_600_PLACEMENT_ID }}
           TEMPLE_ADS_ORIGIN_PASSPHRASE: ${{ vars.TEMPLE_ADS_ORIGIN_PASSPHRASE }}
+          TAKE_ADS_TOKEN: ${{ secrets.TAKE_ADS_TOKEN }}
           CONVERSION_VERIFICATION_URL: ${{ vars.CONVERSION_VERIFICATION_URL }}
 
       - name: Install dependencies and code quality

diff --git a/.github/workflows/secrets-setup/action.yml b/.github/workflows/secrets-setup/action.yml
@@ -73,6 +73,24 @@ inputs:
     required: true
   PERSONA_ADS_SQUARISH_BANNER_UNIT_ID:
     required: true
+  SMARTY_300_250_PLACEMENT_ID:
+    required: true
+  SMARTY_320_50_PLACEMENT_ID:
+    required: true
+  SMARTY_728_90_PLACEMENT_ID:
+    required: true
+  SMARTY_970_90_PLACEMENT_ID:
+    required: true
+  SMARTY_336_280_PLACEMENT_ID:
+    required: true
+  SMARTY_160_600_PLACEMENT_ID:
+    required: true
+  SMARTY_970_250_PLACEMENT_ID:
+    required: true
+  SMARTY_320_100_PLACEMENT_ID:
+    required: true
+  SMARTY_300_600_PLACEMENT_ID:
+    required: true
   CONVERSION_VERIFICATION_URL:
     required: true
   # [e2e]
@@ -168,7 +186,17 @@ runs:
         PERSONA_ADS_MEDIUM_BANNER_UNIT_ID=${{ inputs.PERSONA_ADS_MEDIUM_BANNER_UNIT_ID }}
         PERSONA_ADS_MISES_SQUARISH_BANNER_UNIT_ID=${{ inputs.PERSONA_ADS_MISES_SQUARISH_BANNER_UNIT_ID }}
         PERSONA_ADS_SQUARISH_BANNER_UNIT_ID=${{ inputs.PERSONA_ADS_SQUARISH_BANNER_UNIT_ID }}
+        SMARTY_300_250_PLACEMENT_ID=${{ inputs.SMARTY_300_250_PLACEMENT_ID }}
+        SMARTY_320_50_PLACEMENT_ID=${{ inputs.SMARTY_320_50_PLACEMENT_ID }}
+        SMARTY_728_90_PLACEMENT_ID=${{ inputs.SMARTY_728_90_PLACEMENT_ID }}
+        SMARTY_970_90_PLACEMENT_ID=${{ inputs.SMARTY_970_90_PLACEMENT_ID }}
+        SMARTY_336_280_PLACEMENT_ID=${{ inputs.SMARTY_336_280_PLACEMENT_ID }}
+        SMARTY_160_600_PLACEMENT_ID=${{ inputs.SMARTY_160_600_PLACEMENT_ID }}
+        SMARTY_970_250_PLACEMENT_ID=${{ inputs.SMARTY_970_250_PLACEMENT_ID }}
+        SMARTY_320_100_PLACEMENT_ID=${{ inputs.SMARTY_320_100_PLACEMENT_ID }}
+        SMARTY_300_600_PLACEMENT_ID=${{ inputs.SMARTY_300_600_PLACEMENT_ID }}
         TEMPLE_ADS_ORIGIN_PASSPHRASE=${{ inputs.TEMPLE_ADS_ORIGIN_PASSPHRASE }}
+        TAKE_ADS_TOKEN=${{ inputs.TAKE_ADS_TOKEN }}
         CONVERSION_VERIFICATION_URL=${{ inputs.CONVERSION_VERIFICATION_URL }}
 
         TEMPLE_WALLET_DEVELOPMENT_BRANCH_NAME=${{ github.ref_name }}

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "temple-wallet",
-  "version": "1.25.0",
+  "version": "1.26.0",
   "private": true,
   "scripts": {
     "start-run": "cross-env TS_NODE_PROJECT=\"webpack/tsconfig.json\" webpack --watch --stats errors-warnings",
@@ -72,9 +72,9 @@
     "@taquito/utils": "20.0.0",
     "@temple-wallet/dapp": "5.0.2",
     "@temple-wallet/jest-webextension-mock": "^4.1.0",
-    "@temple-wallet/save-remote-file-webpack-plugin": "^1.1.2",
+    "@temple-wallet/save-remote-file-webpack-plugin": "^1.1.3",
     "@temple-wallet/wallet-address-validator": "^0.4.3",
-    "@temple-wallet/youves-sdk": "^0.0.9",
+    "@temple-wallet/youves-sdk": "^0.0.10",
     "@tezos-domains/core": "1.26.0",
     "@tezos-domains/taquito-client": "1.26.0",
     "@types/async-retry": "1.4.3",
@@ -108,12 +108,11 @@
     "@types/ws": "^7.4.6",
     "@typescript-eslint/eslint-plugin": "^5.43.0",
     "@typescript-eslint/parser": "^5.43.0",
-    "@vespaiach/axios-fetch-adapter": "^0.3.1",
     "assert": "1.5.0",
     "async-mutex": "^0.4.0",
     "async-retry": "1.3.3",
     "autoprefixer": "10.4.2",
-    "axios": "0.26.1",
+    "axios": "^1.7.4",
     "babel-loader": "8.2.5",
     "bignumber.js": "9.1.0",
     "bip39": "3.0.4",
@@ -232,6 +231,6 @@
     "follow-redirects": "^1.15.4"
   },
   "optionalDependencies": {
-    "@temple-wallet/extension-ads": "^7.1.0"
+    "@temple-wallet/extension-ads": "8.1.1"
   }
 }
diff --git a/public/_locales/de/messages.json b/public/_locales/de/messages.json
@@ -832,12 +832,6 @@
   "enable": {
     "message": "aktivieren"
   },
-  "enablePartnersPromotionConfirm": {
-    "message": "Support the development team and earn tokens by viewing ads inside the wallet."
-  },
-  "enablePartnersPromotionDescriptionConfirm": {
-    "message": "To enable this feature, we request your permission to trace your Wallet Address and IP address. You can always disable ads in the settings."
-  },
   "dAppsCheckmarkPrompt": {
     "message": "Klicken Sie auf das Häkchen für die $action$ DApps-Interaktionsfunktion",
     "description": "DApps = Decentralized Applications",

diff --git a/public/_locales/en/messages.json b/public/_locales/en/messages.json
@@ -44,6 +44,12 @@
     "message": "Authorized DApps",
     "description": "DApps = Decentralized Applications"
   },
+  "advancedFeatures": {
+    "message": "Advanced Features"
+  },
+  "advancedFeaturesDescription": {
+    "message": "In this section you can customize additional Temple extension features"
+  },
   "clickIconToResetPermissions": {
     "message": "Click on the X icon to reset permissions."
   },
@@ -2449,7 +2455,7 @@
     "message": "Pay attention: you can receive rewards in TKEY tokens for viewing ads in our wallet. If you disabled Ads, you can always activate it in the settings."
   },
   "enablePartnersPromotionConfirm": {
-    "message": "Support the development team and earn tokens by viewing ads inside the wallet."
+    "message": "Support the development team and earn TKEY tokens by viewing ads."
   },
   "enablePartnersPromotionDescriptionConfirm": {
     "message": "To enable this feature, we request your permission to trace your Wallet Address and IP address. You can always disable ads in the settings."
@@ -2660,6 +2666,12 @@
       }
     }
   },
+  "referralLinks": {
+    "message": "Referral Links"
+  },
+  "referralLinksDescription": {
+    "message": "Automatically receive referral links while order products and services at your favourite online stores."
+  },
   "totalEquityValue": {
     "message": "Total Equity Value"
   },
@@ -2686,6 +2698,38 @@
       }
     }
   },
+  "confirmEnableReferralLinksTitle": {
+    "message": "Do you want to enable referral links?"
+  },
+  "confirmEnableReferralLinksDescription": {
+    "message": "This feature requires new terms and policy agreement. To enable referral links, please review and agree to the new $termsOfUse$, $privacyPolicy$.",
+    "placeholders": {
+      "termsOfUse": {
+        "content": "$1"
+      },
+      "privacyPolicy": {
+        "content": "$2"
+      }
+    }
+  },
+  "agreeAndContinue": {
+    "message": "Agree & Continue"
+  },
+  "templeUpdate": {
+    "message": "Temple Update"
+  },
+  "templeWalletUpdate": {
+    "message": "Temple Wallet Update"
+  },
+  "templeUpdateDescription": {
+    "message": "Our Terms of Use, Privacy Policy have updated and we’ve added new section in settings for easier advanced features control. Please review and agree to the new terms to continue. "
+  },
+  "templeWalletUpdateDescription": {
+    "message": "Our Terms of Use and Privacy Policy have been updated. Please review the new terms and agree to ensure a smooth experience with your wallet."
+  },
+  "reviewUpdate": {
+    "message": "Review update"
+  },
   "buyWithCrypto": {
     "message": "Buy with Crypto"
   },

diff --git a/public/_locales/en_GB/messages.json b/public/_locales/en_GB/messages.json
@@ -824,12 +824,6 @@
   "enable": {
     "message": "enable"
   },
-  "enablePartnersPromotionConfirm": {
-    "message": "Support the development team and earn tokens by viewing ads inside the wallet."
-  },
-  "enablePartnersPromotionDescriptionConfirm": {
-    "message": "To enable this feature, we request your permission to trace your Wallet Address and IP address. You can always disable ads in the settings."
-  },
   "dAppsCheckmarkPrompt": {
     "message": "Click on the checkmark to $action$ DApps interaction feature",
     "description": "DApps = Decentralized Applications",

diff --git a/public/_locales/fr/messages.json b/public/_locales/fr/messages.json
@@ -793,12 +793,6 @@
   "enable": {
     "message": "activer"
   },
-  "enablePartnersPromotionConfirm": {
-    "message": "Support the development team and earn tokens by viewing ads inside the wallet."
-  },
-  "enablePartnersPromotionDescriptionConfirm": {
-    "message": "To enable this feature, we request your permission to trace your Wallet Address and IP address. You can always disable ads in the settings."
-  },
   "dAppsCheckmarkPrompt": {
     "message": "Cliquez sur la coce pour $action$ la fonctionnalité interactions des applications décentralisées",
     "description": "DApps = Decentralized Applications",

diff --git a/public/_locales/ja/messages.json b/public/_locales/ja/messages.json
@@ -789,12 +789,6 @@
   "enable": {
     "message": "有効にする"
   },
-  "enablePartnersPromotionConfirm": {
-    "message": "Support the development team and earn tokens by viewing ads inside the wallet."
-  },
-  "enablePartnersPromotionDescriptionConfirm": {
-    "message": "To enable this feature, we request your permission to trace your Wallet Address and IP address. You can always disable ads in the settings."
-  },
   "dAppsCheckmarkPrompt": {
     "message": "チェックマークをクリックして、DAppsインタラクション機能を$action$",
     "description": "DApps = Decentralized Applications",

diff --git a/public/_locales/ko/messages.json b/public/_locales/ko/messages.json
@@ -789,12 +789,6 @@
   "enable": {
     "message": "활성화"
   },
-  "enablePartnersPromotionConfirm": {
-    "message": "Support the development team and earn tokens by viewing ads inside the wallet."
-  },
-  "enablePartnersPromotionDescriptionConfirm": {
-    "message": "To enable this feature, we request your permission to trace your Wallet Address and IP address. You can always disable ads in the settings."
-  },
   "dAppsCheckmarkPrompt": {
     "message": "분산 앱 상호 소통 기능을 $action$하려면 체크표시를 클릭하세요",
     "description": "DApps = Decentralized Applications",

diff --git a/public/_locales/pt/messages.json b/public/_locales/pt/messages.json
@@ -832,12 +832,6 @@
   "enable": {
     "message": "ativar"
   },
-  "enablePartnersPromotionConfirm": {
-    "message": "Support the development team and earn tokens by viewing ads inside the wallet."
-  },
-  "enablePartnersPromotionDescriptionConfirm": {
-    "message": "To enable this feature, we request your permission to trace your Wallet Address and IP address. You can always disable ads in the settings."
-  },
   "dAppsCheckmarkPrompt": {
     "message": "Clique na marca de verificação para $action$ da funcionalidade de interação DApps",
     "description": "DApps = Decentralized Applications",

diff --git a/public/_locales/ru/messages.json b/public/_locales/ru/messages.json
@@ -198,11 +198,5 @@
         "content": "$1"
       }
     }
-  },
-  "enablePartnersPromotionConfirm": {
-    "message": "Support the development team and earn tokens by viewing ads inside the wallet."
-  },
-  "enablePartnersPromotionDescriptionConfirm": {
-    "message": "To enable this feature, we request your permission to trace your Wallet Address and IP address. You can always disable ads in the settings."
   }
 }
diff --git a/public/_locales/tr/messages.json b/public/_locales/tr/messages.json
@@ -832,12 +832,6 @@
   "enable": {
     "message": "etkinleştir"
   },
-  "enablePartnersPromotionConfirm": {
-    "message": "Support the development team and earn tokens by viewing ads inside the wallet."
-  },
-  "enablePartnersPromotionDescriptionConfirm": {
-    "message": "To enable this feature, we request your permission to trace your Wallet Address and IP address. You can always disable ads in the settings."
-  },
   "dAppsCheckmarkPrompt": {
     "message": "DApps etkileşim özelliğine yönelik $action$ için onay işaretine tıklayın",
     "description": "DApps = Decentralized Applications",

diff --git a/public/_locales/uk/messages.json b/public/_locales/uk/messages.json
@@ -814,10 +814,10 @@
     "message": "увімкнути"
   },
   "enablePartnersPromotionConfirm": {
-    "message": "Support the development team and earn tokens by viewing ads inside the wallet."
+    "message": "Підтримуйте команду розробників та заробляйте TKEY токени, переглядаючи рекламу."
   },
   "enablePartnersPromotionDescriptionConfirm": {
-    "message": "To enable this feature, we request your permission to trace your Wallet Address and IP address. You can always disable ads in the settings."
+    "message": "Ми просимо вашого дозволу відслідковувати вашу адресу гаманця та IP адресу, щоб активувати цю функціональність. Ви завжди зможете вимкнути рекламу в налаштуваннях."
   },
   "dAppsCheckmarkPrompt": {
     "message": "Клацніть на галочку щоб $action$ функцію взаємодію з DApp'ками",

diff --git a/public/_locales/zh_CN/messages.json b/public/_locales/zh_CN/messages.json
@@ -793,12 +793,6 @@
   "enable": {
     "message": "启用"
   },
-  "enablePartnersPromotionConfirm": {
-    "message": "Support the development team and earn tokens by viewing ads inside the wallet."
-  },
-  "enablePartnersPromotionDescriptionConfirm": {
-    "message": "To enable this feature, we request your permission to trace your Wallet Address and IP address. You can always disable ads in the settings."
-  },
   "dAppsCheckmarkPrompt": {
     "message": "点击勾号以$action$DApp互动功能",
     "description": "DApps = Decentralized Applications",