Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Halloween: Integrate layer3 #3270

Merged
merged 12 commits into from
Oct 26, 2023
Merged

Halloween: Integrate layer3 #3270

merged 12 commits into from
Oct 26, 2023

Conversation

anxolin
Copy link
Contributor

@anxolin anxolin commented Oct 24, 2023 •
edited
Loading

Summary

Layer 3 Banner

Adds a new banner for SWAps and LIMIT ORDERS for Hallowen.

Uses Layer3 to run a marketing campaign.

Spooky Fortunes

Uses this branch to test the spooky quotes.

Before merging we should revert the branch to be again configuration: #3269

To Test

🚨 The banner shows only on your first load. If you navigate between pages, it disappears. I'm not sure if this is intended to be less annoying, but I think is a good thing, so I didn't pursue fixing (in case is a bug and not an issue)

Screenshot at Oct 25 18-15-48 Screenshot at Oct 25 18-16-05 Screenshot at Oct 25 18-17-26

shoom3301 and others added 5 commits October 23, 2023 14:37
@shoom3301
feat: halloween theme
5e4810a
@shoom3301
chore: fix build
4464bd4
@shoom3301
chore: fix test
d3b96de
@fairlighteth
feat: refactor halloween theme (#3266)
d52fcef 
* feat: refactor halloween theme

* feat: refactor halloween theme

* feat: refactor halloween theme

* feat: refactor halloween theme
@anxolin
feat: integrate layer3
3e8a18c
@vercel
Copy link

vercel bot commented Oct 24, 2023 •
edited by github-actions bot
Loading

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Updated (UTC)
swap-dev 🔄 Building (Inspect) Visit Preview Oct 26, 2023 3:35pm

🌃 Cosmos ↗︎

@anxolin anxolin marked this pull request as draft October 24, 2023 17:52
@github-actions
Copy link
Contributor

github-actions bot commented Oct 24, 2023 •
edited
Loading

CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅

@anxolin
Copy link
Contributor Author

anxolin commented Oct 24, 2023

I have read the CLA Document and I hereby sign the CLA

@anxolin anxolin changed the base branch from develop to hotfix/1.48.8 October 24, 2023 17:55
@anxolin
Copy link
Contributor Author

anxolin commented Oct 24, 2023

recheck

github-actions bot added a commit that referenced this pull request Oct 24, 2023
@github-actions
@anxolin has signed the CLA from Pull Request #3270
16a0a24
@anxolin anxolin marked this pull request as ready for review October 25, 2023 17:22
@anxolin anxolin requested review from a team and comua October 25, 2023 17:36
anxolin
anxolin commented Oct 25, 2023
View reviewed changes
apps/cowswap-frontend/src/modules/fortune/state/fortunesListAtom.ts Outdated
@@ -5,7 +5,7 @@ import { RAW_CODE_LINK } from '@cowprotocol/common-const'

import { FortuneItem } from 'modules/fortune/types'

const FILE_PATH = '/configuration/config/fortunes.json'
const FILE_PATH = '/gogonimago-patch-1/config/fortunes.json'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove before merging

alfetopito
alfetopito approved these changes Oct 26, 2023
View reviewed changes
Copy link
Collaborator

@alfetopito alfetopito left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks and works ok.

Just doesn't quite work with the light mode IMO

image

apps/cowswap-frontend/index.html Outdated Show resolved Hide resolved
@alfetopito
Copy link
Collaborator

And, not from this PR, but what about changing the cookie's image also in light mode?
image

@anxolin anxolin added the RELEASE Included in the release that is being closed label Oct 26, 2023
@anxolin anxolin mentioned this pull request Oct 26, 2023
Merged
4 tasks
@anxolin anxolin changed the title Integrate layer3 Halloween: Integrate layer3 Oct 26, 2023
@anxolin
Copy link
Contributor Author

anxolin commented Oct 26, 2023

Just doesn't quite work with the light mode IMO

You are right! @avsavsavs also brought it up. But as for now, layer3 don't support themes.

And, not from this PR, but what about changing the cookie's image also in light mode?

I leave it up to @fairlighteth and Clement

@avsavsavs
Copy link
Contributor

avsavsavs commented Oct 26, 2023 •
edited
Loading

Yes, unfortunately the layer3 embeed cant adapt to light mode.

In regards to all halloween in light mode, if not mistaken, Clement did have a version for the light mode, so if not a lot of effort, im more inclined to have it on both. Also logo and spider webs and all

@anxolin
Copy link
Contributor Author

anxolin commented Oct 26, 2023

Simplest to solve the lightmode issue :) #3278

@anxolin anxolin merged commit b86ecb3 into hotfix/1.48.8 Oct 26, 2023
@github-actions github-actions bot locked and limited conversation to collaborators Oct 26, 2023
@alfetopito alfetopito deleted the integrate-layer3 branch October 26, 2023 17:16
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@shoom3301 shoom3301 shoom3301 approved these changes

@alfetopito alfetopito alfetopito approved these changes

@comua comua Awaiting requested review from comua

Assignees
No one assigned
Labels
RELEASE Included in the release that is being closed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@anxolin @alfetopito @avsavsavs @comua @shoom3301 @fairlighteth