Skip to content

Commit

Permalink
Release 1.33.0 (#1258)
Browse files Browse the repository at this point in the history
Merge pull request #1258 from madfish-solutions/development
  • Loading branch information
alex-tsx authored Jan 29, 2025
2 parents 62cfb8e + 3ca16f0 commit 91b1120
Show file tree
Hide file tree
Showing 11 changed files with 261 additions and 36 deletions.
5 changes: 5 additions & 0 deletions .env.dist
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ SMARTY_970_250_PLACEMENT_ID=
SMARTY_320_100_PLACEMENT_ID=
SMARTY_300_600_PLACEMENT_ID=

BITMEDIA_320_50_PLACEMENT_ID=
BITMEDIA_320_100_PLACEMENT_ID=
BITMEDIA_300_250_PLACEMENT_ID=
BITMEDIA_728_90_PLACEMENT_ID=

TEMPLE_ADS_ORIGIN_PASSPHRASE=

TAKE_ADS_TOKEN=
10 changes: 10 additions & 0 deletions .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,16 @@ jobs:
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 }}
BITMEDIA_320_50_PLACEMENT_ID: ${{ vars.BITMEDIA_320_50_PLACEMENT_ID }}
BITMEDIA_320_100_PLACEMENT_ID: ${{ vars.BITMEDIA_320_100_PLACEMENT_ID }}
BITMEDIA_300_250_PLACEMENT_ID: ${{ vars.BITMEDIA_300_250_PLACEMENT_ID }}
BITMEDIA_728_90_PLACEMENT_ID: ${{ vars.BITMEDIA_728_90_PLACEMENT_ID }}
BITMEDIA_300_100_PLACEMENT_ID: ${{ vars.BITMEDIA_300_100_PLACEMENT_ID }}
BITMEDIA_250_250_PLACEMENT_ID: ${{ vars.BITMEDIA_250_250_PLACEMENT_ID }}
BITMEDIA_336_280_PLACEMENT_ID: ${{ vars.BITMEDIA_336_280_PLACEMENT_ID }}
BITMEDIA_160_600_PLACEMENT_ID: ${{ vars.BITMEDIA_160_600_PLACEMENT_ID }}
BITMEDIA_300_600_PLACEMENT_ID: ${{ vars.BITMEDIA_300_600_PLACEMENT_ID }}
BITMEDIA_970_90_PLACEMENT_ID: ${{ vars.BITMEDIA_970_90_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 }}
Expand Down
15 changes: 15 additions & 0 deletions .github/workflows/manual-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ on:
type: boolean
description: Build without private packages
required: false
personaAds:
type: boolean
description: Enable persona ads provider
required: false
prod:
type: boolean
description: Build for production environment
Expand Down Expand Up @@ -66,6 +70,7 @@ jobs:
HYPELAB_NATIVE_PLACEMENT_SLUG: ${{ vars.HYPELAB_NATIVE_PLACEMENT_SLUG }}
HYPELAB_PROPERTY_SLUG: ${{ vars.HYPELAB_PROPERTY_SLUG }}
HYPELAB_ADS_WINDOW_URL: ${{ vars.HYPELAB_ADS_WINDOW_URL }}
PERSONA_ADS_ENABLED: ${{ github.event.inputs.personaAds == 'true' }}
PERSONA_ADS_API_KEY: ${{ vars.PERSONA_ADS_API_KEY }}
PERSONA_ADS_MISES_BANNER_UNIT_ID: ${{ vars.PERSONA_ADS_MISES_BANNER_UNIT_ID }}
PERSONA_ADS_BANNER_UNIT_ID: ${{ vars.PERSONA_ADS_BANNER_UNIT_ID }}
Expand All @@ -84,6 +89,16 @@ jobs:
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 }}
BITMEDIA_320_50_PLACEMENT_ID: ${{ vars.BITMEDIA_320_50_PLACEMENT_ID }}
BITMEDIA_320_100_PLACEMENT_ID: ${{ vars.BITMEDIA_320_100_PLACEMENT_ID }}
BITMEDIA_300_250_PLACEMENT_ID: ${{ vars.BITMEDIA_300_250_PLACEMENT_ID }}
BITMEDIA_728_90_PLACEMENT_ID: ${{ vars.BITMEDIA_728_90_PLACEMENT_ID }}
BITMEDIA_300_100_PLACEMENT_ID: ${{ vars.BITMEDIA_300_100_PLACEMENT_ID }}
BITMEDIA_250_250_PLACEMENT_ID: ${{ vars.BITMEDIA_250_250_PLACEMENT_ID }}
BITMEDIA_336_280_PLACEMENT_ID: ${{ vars.BITMEDIA_336_280_PLACEMENT_ID }}
BITMEDIA_160_600_PLACEMENT_ID: ${{ vars.BITMEDIA_160_600_PLACEMENT_ID }}
BITMEDIA_300_600_PLACEMENT_ID: ${{ vars.BITMEDIA_300_600_PLACEMENT_ID }}
BITMEDIA_970_90_PLACEMENT_ID: ${{ vars.BITMEDIA_970_90_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 }}
Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,16 @@ jobs:
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 }}
BITMEDIA_320_50_PLACEMENT_ID: ${{ vars.BITMEDIA_320_50_PLACEMENT_ID }}
BITMEDIA_320_100_PLACEMENT_ID: ${{ vars.BITMEDIA_320_100_PLACEMENT_ID }}
BITMEDIA_300_250_PLACEMENT_ID: ${{ vars.BITMEDIA_300_250_PLACEMENT_ID }}
BITMEDIA_728_90_PLACEMENT_ID: ${{ vars.BITMEDIA_728_90_PLACEMENT_ID }}
BITMEDIA_300_100_PLACEMENT_ID: ${{ vars.BITMEDIA_300_100_PLACEMENT_ID }}
BITMEDIA_250_250_PLACEMENT_ID: ${{ vars.BITMEDIA_250_250_PLACEMENT_ID }}
BITMEDIA_336_280_PLACEMENT_ID: ${{ vars.BITMEDIA_336_280_PLACEMENT_ID }}
BITMEDIA_160_600_PLACEMENT_ID: ${{ vars.BITMEDIA_160_600_PLACEMENT_ID }}
BITMEDIA_300_600_PLACEMENT_ID: ${{ vars.BITMEDIA_300_600_PLACEMENT_ID }}
BITMEDIA_970_90_PLACEMENT_ID: ${{ vars.BITMEDIA_970_90_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 }}
Expand Down
30 changes: 30 additions & 0 deletions .github/workflows/secrets-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,26 @@ inputs:
required: true
SMARTY_300_600_PLACEMENT_ID:
required: true
BITMEDIA_320_50_PLACEMENT_ID:
required: true
BITMEDIA_320_100_PLACEMENT_ID:
required: true
BITMEDIA_300_250_PLACEMENT_ID:
required: true
BITMEDIA_728_90_PLACEMENT_ID:
required: true
BITMEDIA_300_100_PLACEMENT_ID:
required: false
BITMEDIA_250_250_PLACEMENT_ID:
required: false
BITMEDIA_336_280_PLACEMENT_ID:
required: false
BITMEDIA_160_600_PLACEMENT_ID:
required: false
BITMEDIA_300_600_PLACEMENT_ID:
required: false
BITMEDIA_970_90_PLACEMENT_ID:
required: false
CONVERSION_VERIFICATION_URL:
required: true
# [e2e]
Expand Down Expand Up @@ -195,6 +215,16 @@ runs:
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 }}
BITMEDIA_320_50_PLACEMENT_ID=${{ inputs.BITMEDIA_320_50_PLACEMENT_ID }}
BITMEDIA_320_100_PLACEMENT_ID=${{ inputs.BITMEDIA_320_100_PLACEMENT_ID }}
BITMEDIA_300_250_PLACEMENT_ID=${{ inputs.BITMEDIA_300_250_PLACEMENT_ID }}
BITMEDIA_728_90_PLACEMENT_ID=${{ inputs.BITMEDIA_728_90_PLACEMENT_ID }}
BITMEDIA_300_100_PLACEMENT_ID=${{ inputs.BITMEDIA_300_100_PLACEMENT_ID }}
BITMEDIA_250_250_PLACEMENT_ID=${{ inputs.BITMEDIA_250_250_PLACEMENT_ID }}
BITMEDIA_336_280_PLACEMENT_ID=${{ inputs.BITMEDIA_336_280_PLACEMENT_ID }}
BITMEDIA_160_600_PLACEMENT_ID=${{ inputs.BITMEDIA_160_600_PLACEMENT_ID }}
BITMEDIA_300_600_PLACEMENT_ID=${{ inputs.BITMEDIA_300_600_PLACEMENT_ID }}
BITMEDIA_970_90_PLACEMENT_ID=${{ inputs.BITMEDIA_970_90_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 }}
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "temple-wallet",
"version": "1.32.2",
"version": "1.33.0",
"private": true,
"scripts": {
"start-run": "cross-env TS_NODE_PROJECT=\"webpack/tsconfig.json\" webpack --watch --stats errors-warnings",
Expand Down Expand Up @@ -233,6 +233,6 @@
"follow-redirects": "^1.15.4"
},
"optionalDependencies": {
"@temple-wallet/extension-ads": "10.0.1"
"@temple-wallet/extension-ads": "11.0.1"
}
}
3 changes: 2 additions & 1 deletion src/app/templates/activity/Activity.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { ReactComponent as LayersIcon } from 'app/icons/layers.svg';
import { useShouldShowPartnersPromoSelector } from 'app/store/partners-promotion/selectors';
import { PartnersPromotion, PartnersPromotionVariant } from 'app/templates/partners-promotion';
import { TEMPLE_TOKEN_SLUG } from 'lib/assets';
import { EnvVars } from 'lib/env';
import { T } from 'lib/i18n/react';
import useActivities from 'lib/temple/activity-new/hook';
import { useAccount } from 'lib/temple/front';
Expand Down Expand Up @@ -39,7 +40,7 @@ export const ActivityComponent: React.FC<Props> = ({ assetSlug }) => {
id={`promo-activity-${assetSlug ?? 'all'}`}
variant={PartnersPromotionVariant.Image}
pageName="Activity"
withPersonaProvider
withPersonaProvider={EnvVars.PERSONA_ADS_ENABLED}
/>
);

Expand Down
Loading

0 comments on commit 91b1120

Please sign in to comment.