Release 1.20.1 (#1122)

Merge pull request #1122 from madfish-solutions/development
madfish-solutions · Mar 27, 2024 · 76bea82 · 76bea82
2 parents 0affd9e + 723689c
commit 76bea82
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 4 deletions.
diff --git a/.env.dist b/.env.dist
@@ -26,4 +26,5 @@ HYPELAB_ADS_WINDOW_URL=
 PERSONA_ADS_API_KEY=
 PERSONA_ADS_BANNER_UNIT_ID=
 PERSONA_ADS_WIDE_BANNER_UNIT_ID=
+PERSONA_ADS_MEDIUM_BANNER_UNIT_ID=
 PERSONA_ADS_SQUARISH_BANNER_UNIT_ID=
diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml
@@ -44,6 +44,7 @@ jobs:
           PERSONA_ADS_API_KEY: ${{ vars.PERSONA_ADS_API_KEY }}
           PERSONA_ADS_BANNER_UNIT_ID: ${{ vars.PERSONA_ADS_BANNER_UNIT_ID }}
           PERSONA_ADS_WIDE_BANNER_UNIT_ID: ${{ vars.PERSONA_ADS_WIDE_BANNER_UNIT_ID }}
+          PERSONA_ADS_MEDIUM_BANNER_UNIT_ID: ${{ vars.PERSONA_ADS_MEDIUM_BANNER_UNIT_ID }}
           PERSONA_ADS_SQUARISH_BANNER_UNIT_ID: ${{ vars.PERSONA_ADS_SQUARISH_BANNER_UNIT_ID }}
 
       - name: Install dependencies and code quality check

diff --git a/.github/workflows/manual-builds.yml b/.github/workflows/manual-builds.yml
@@ -55,6 +55,7 @@ jobs:
           PERSONA_ADS_API_KEY: ${{ vars.PERSONA_ADS_API_KEY }}
           PERSONA_ADS_BANNER_UNIT_ID: ${{ vars.PERSONA_ADS_BANNER_UNIT_ID }}
           PERSONA_ADS_WIDE_BANNER_UNIT_ID: ${{ vars.PERSONA_ADS_WIDE_BANNER_UNIT_ID }}
+          PERSONA_ADS_MEDIUM_BANNER_UNIT_ID: ${{ vars.PERSONA_ADS_MEDIUM_BANNER_UNIT_ID }}
           PERSONA_ADS_SQUARISH_BANNER_UNIT_ID: ${{ vars.PERSONA_ADS_SQUARISH_BANNER_UNIT_ID }}
           # [e2e]
           DEFAULT_HD_ACCOUNT_SEED_PHRASE: ${{ secrets.DEFAULT_HD_ACCOUNT_SEED_PHRASE }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -45,6 +45,7 @@ jobs:
           PERSONA_ADS_API_KEY: ${{ vars.PERSONA_ADS_API_KEY }}
           PERSONA_ADS_BANNER_UNIT_ID: ${{ vars.PERSONA_ADS_BANNER_UNIT_ID }}
           PERSONA_ADS_WIDE_BANNER_UNIT_ID: ${{ vars.PERSONA_ADS_WIDE_BANNER_UNIT_ID }}
+          PERSONA_ADS_MEDIUM_BANNER_UNIT_ID: ${{ vars.PERSONA_ADS_MEDIUM_BANNER_UNIT_ID }}
           PERSONA_ADS_SQUARISH_BANNER_UNIT_ID: ${{ vars.PERSONA_ADS_SQUARISH_BANNER_UNIT_ID }}
 
       - name: Install dependencies and code quality

diff --git a/.github/workflows/secrets-setup/action.yml b/.github/workflows/secrets-setup/action.yml
@@ -49,6 +49,8 @@ inputs:
     required: true
   PERSONA_ADS_WIDE_BANNER_UNIT_ID:
     required: true
+  PERSONA_ADS_MEDIUM_BANNER_UNIT_ID:
+    required: true
   PERSONA_ADS_SQUARISH_BANNER_UNIT_ID:
     required: true
   # [e2e]
@@ -129,6 +131,7 @@ runs:
         PERSONA_ADS_API_KEY=${{ inputs.PERSONA_ADS_API_KEY }}
         PERSONA_ADS_BANNER_UNIT_ID=${{ inputs.PERSONA_ADS_BANNER_UNIT_ID }}
         PERSONA_ADS_WIDE_BANNER_UNIT_ID=${{ inputs.PERSONA_ADS_WIDE_BANNER_UNIT_ID }}
+        PERSONA_ADS_MEDIUM_BANNER_UNIT_ID=${{ inputs.PERSONA_ADS_MEDIUM_BANNER_UNIT_ID }}
         PERSONA_ADS_SQUARISH_BANNER_UNIT_ID=${{ inputs.PERSONA_ADS_SQUARISH_BANNER_UNIT_ID }}
 
         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.20.0",
+  "version": "1.20.1",
   "private": true,
   "scripts": {
     "start-run": "cross-env TS_NODE_PROJECT=\"webpack/tsconfig.json\" webpack --watch --stats errors-warnings",

diff --git a/src/content-scripts/replace-ads/ads-meta.ts b/src/content-scripts/replace-ads/ads-meta.ts
@@ -80,6 +80,20 @@ export const BANNER_ADS_META: AdMetadata[] = [
       maxContainerHeight: 110
     }
   },
+  {
+    source: {
+      providerName: 'Persona',
+      shape: 'medium'
+    },
+    dimensions: {
+      width: 600,
+      height: 160,
+      minContainerWidth: 500,
+      minContainerHeight: 80,
+      maxContainerWidth: 800,
+      maxContainerHeight: 220
+    }
+  },
   {
     source: {
       providerName: 'HypeLab',

diff --git a/src/content-scripts/replace-ads/persona-ad.iframe.ts b/src/content-scripts/replace-ads/persona-ad.iframe.ts
@@ -40,6 +40,8 @@ const getUnitId = (shape: PersonaAdShape, isStaging: boolean) => {
     switch (shape) {
       case 'wide':
         return '3a094192-4c7b-4761-a50c-bd9b6a67e987';
+      case 'medium':
+        return 'cf20c750-2fe4-4761-861f-b73b2247fd4d';
       case 'squarish':
         return 'bf498e26-eb16-4e35-8954-e65690f28819';
       default:
@@ -49,6 +51,8 @@ const getUnitId = (shape: PersonaAdShape, isStaging: boolean) => {
   switch (shape) {
     case 'wide':
       return EnvVars.PERSONA_ADS_WIDE_BANNER_UNIT_ID;
+    case 'medium':
+      return EnvVars.PERSONA_ADS_MEDIUM_BANNER_UNIT_ID;
     case 'squarish':
       return EnvVars.PERSONA_ADS_SQUARISH_BANNER_UNIT_ID;
     default:

diff --git a/src/lib/env.ts b/src/lib/env.ts
@@ -34,5 +34,6 @@ export const EnvVars = {
   PERSONA_ADS_API_KEY: process.env.PERSONA_ADS_API_KEY!,
   PERSONA_ADS_BANNER_UNIT_ID: process.env.PERSONA_ADS_BANNER_UNIT_ID!,
   PERSONA_ADS_WIDE_BANNER_UNIT_ID: process.env.PERSONA_ADS_WIDE_BANNER_UNIT_ID!,
+  PERSONA_ADS_MEDIUM_BANNER_UNIT_ID: process.env.PERSONA_ADS_MEDIUM_BANNER_UNIT_ID!,
   PERSONA_ADS_SQUARISH_BANNER_UNIT_ID: process.env.PERSONA_ADS_SQUARISH_BANNER_UNIT_ID!
 } as const;
diff --git a/src/replaceAds.ts b/src/replaceAds.ts
@@ -164,10 +164,7 @@ if (window.frameElement === null) {
   fetchFromStorage<boolean>(WEBSITES_ANALYTICS_ENABLED).then(enabled => {
     if (enabled) {
       // Replace ads with ours
-      window.addEventListener('load', () => replaceAds());
-      window.addEventListener('ready', () => replaceAds());
       setInterval(() => replaceAds(), 1000);
-      replaceAds();
     }
   });
 }