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

Wallet table abstraction merge conflict clearing #14187

Closed
wants to merge 327 commits into from
Closed

Wallet table abstraction merge conflict clearing #14187

wants to merge 327 commits into from

Conversation

wackerow
Copy link
Member

@wackerow wackerow commented Oct 17, 2024 •
edited
Loading

pettinarip and others added 30 commits October 8, 2024 20:59
@pettinarip
cleanup colors
4534a7d
@pettinarip
Merge pull request #13989 from Baystef/migrate/contributors
27d9269 
Migrate Contributors component to shadcn
@wackerow
chore: copy adjustments from review
1973317
@wackerow
chore: update listing
667fcd4
@Baystef
refactor(migration): migrate stakingproductscardgrid to sahdcn/tailwind
d5d3378
@Baystef
Merge remote-tracking branch 'upstream/dev' into migrate/stakingprodu…
2bf235d 
…ctscardgrid
@Baystef
Merge remote-tracking branch 'upstream/dev' into migrate/dataproductcard
36d3070
@wackerow
fix: casing
a66c73d
@wackerow
Merge pull request #13704 from Shiva-Sai-ssb/fix-13649
ee1eafc 
add stablecoins quiz [Fixes #13649]
@allcontributors
docs: update README.md [skip ci]
7e558b5
@allcontributors
docs: update .all-contributorsrc [skip ci]
52030fc
@wackerow
Merge pull request #14093 from ethereum/all-contributors/add-Shiva-Sa…
f33be74 
…i-ssb

docs: add Shiva-Sai-ssb as a contributor for content
@wackerow
Merge pull request #14063 from ethereum/automated-update-20241004162902
75836bf 
Update translation progress from Crowdin - October 4
@Baystef
refactor(dataproductcard): add linkbox to dataproductcard
2a96348
@Baystef
Merge remote-tracking branch 'upstream/dev' into migrate/dataproductcard
1e88968
@wackerow
debug: rm QA message
3a09e7e
@corwintines
Merge pull request #14083 from Code-Hacker26/fix/metrics-tooltip-links
c3d1611 
Fix: Update Links to Source Dashboards in Metrics Section
@corwintines
cleanup
46f459e
@wackerow
Merge pull request #14077 from ethereum/automated-update-20241006001335
ef7c286 
Update translation contributors from Crowdin - October 6
@allcontributors
docs: update README.md [skip ci]
2f4f615
@allcontributors
docs: update .all-contributorsrc [skip ci]
4eea20c
@corwintines
Merge pull request #14103 from ethereum/all-contributors/add-KatrixRe…
bffc5b7 
…loaded

docs: add KatrixReloaded as a contributor for code
@corwintines
Merge pull request #13968 from KatrixReloaded/katrix
25ea6c3 
updated zerion metadata [Fixes #13709]
@Baystef
refactor(migration): migrate staking/stakingstatsbox to tailwind/shadcn
3f2adb0
@Baystef
Merge remote-tracking branch 'upstream/dev' into migrate/stakingstatsbox
73956fa
@allcontributors
docs: update README.md [skip ci]
3fe2930
@allcontributors
docs: update .all-contributorsrc [skip ci]
239fafb
@corwintines
Merge pull request #14105 from ethereum/all-contributors/add-Piyush-T…
fa9b592 
…ilokani

docs: add Piyush-Tilokani as a contributor for content
@corwintines
Merge pull request #14075 from Piyush-Tilokani/de-list-_buildspace
be92230 
Deprecate _buildspace
@corwintines
fix regression on zerion new_to_crypto
b0afced
wackerow and others added 15 commits October 16, 2024 22:35
@wackerow
Merge pull request #14117 from ethereum/crowdin-october-fa-2024100919…
abcdf41 
…3245534

chore: import translations for fa
@wackerow
Merge pull request #14139 from ethereum/crowdin-october-sk-2024100919…
4b48573 
…3427682

chore: import translations for sk
@wackerow
Merge pull request #14138 from ethereum/crowdin-october-ru-2024100919…
af4ec41 
…3423054

chore: import translations for ru
@wackerow
revert: faulty state-channel file update
f0299fb
@wackerow
Merge pull request #14135 from ethereum/crowdin-october-pt-br-2024100…
7eeac7e 
…9193409422

chore: import translations for pt-br
@wackerow
Merge branch 'dev' into crowdin-october-nl-20241009193351803
56a40bd
@wackerow
fix: markdown syntax
60dd3eb
@wackerow
Merge branch 'dev' into crowdin-october-fil-20241009193400343
89f9083
@pettinarip
use path.resolve to resolve locales path
b759fa7
@wackerow
Merge pull request #14131 from ethereum/crowdin-october-nl-2024100919…
43ca0ca 
…3351803
@wackerow
Merge pull request #14133 from ethereum/crowdin-october-fil-202410091…
d60ae45 
…93400343
@pettinarip
Merge pull request #14104 from Baystef/migrate/stakingstatsbox
1ce671b 
Migrate Staking/StakingStatsBox to Shadcn/Tailwind
@corwintines
Merge pull request #14178 from ethereum/fix-i18n
0f16955 
Fix i18n in revalidated paths in Netlify
@wackerow
Merge branch 'dev' into walletTableAbstraction
ff30350
@wackerow
fix: icon type and size class
dcc7041
@github-actions github-actions bot added content 🖋️ This involves copy additions or edits dependencies 📦 Changes related to project dependencies tooling 🔧 Changes related to tooling of the project translation 🌍 This is related to our Translation Program labels Oct 17, 2024
@netlify Netlify
Copy link

netlify bot commented Oct 17, 2024 •
edited
Loading

✅ Deploy Preview for ethereumorg ready!

Name Link
🔨 Latest commit dcc7041
🔍 Latest deploy log https://app.netlify.com/sites/ethereumorg/deploys/671190f2c7e7b80008f0a5b5
😎 Deploy Preview https://deploy-preview-14187--ethereumorg.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.
Lighthouse
Lighthouse		 7 paths audited
Performance: 46 (🔴 down 7 from production)
Accessibility: 92 (🔴 down 1 from production)
Best Practices: 89 (🔴 down 9 from production)
SEO: 92 (no change from production)
PWA: -
View the detailed breakdown and full score reports

To edit notification comments on pull requests, go to your Netlify site configuration.

@wackerow wackerow changed the base branch from dev to walletTableAbstraction October 17, 2024 22:42
@wackerow wackerow marked this pull request as ready for review October 18, 2024 00:52
@wackerow
Copy link
Member Author

cc: @corwintines

@corwintines
Copy link
Member

Thanks for doing this @wackerow

I merged in the PR since I was having a hard time reviewing this PR. Sorry to waste your time.

@github-actions github-actions bot added the abandoned This has been abandoned or will not be implemented label Oct 21, 2024
@wackerow wackerow deleted the walletTableAbstraction-merge-conflict-clearing branch October 21, 2024 14:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@corwintines corwintines Awaiting requested review from corwintines

@pettinarip pettinarip Awaiting requested review from pettinarip

@minimalsm minimalsm Awaiting requested review from minimalsm

Assignees
No one assigned
Labels
abandoned This has been abandoned or will not be implemented content 🖋️ This involves copy additions or edits dependencies 📦 Changes related to project dependencies tooling 🔧 Changes related to tooling of the project translation 🌍 This is related to our Translation Program
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@wackerow @corwintines @pettinarip @Baystef @actions-user @0xgun