Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
68c9ab1
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp May 6, 2025
1a354ad
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp May 7, 2025
0db9fa2
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp May 7, 2025
c2c74bf
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp May 9, 2025
b4e4971
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp May 14, 2025
56fbe4a
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp May 15, 2025
5d86d50
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp May 20, 2025
7baea76
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp May 21, 2025
eeaf5ed
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp May 22, 2025
1a5a1d0
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp May 23, 2025
b013ce6
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp May 26, 2025
fde6101
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp May 27, 2025
b25042b
merge
svenvoskamp May 30, 2025
56e5ba4
merge
svenvoskamp May 30, 2025
5b41e3d
merge
svenvoskamp Jun 2, 2025
a4b6118
merge
svenvoskamp Jun 3, 2025
68d55e0
merge
svenvoskamp Jun 4, 2025
66bbf81
merge
svenvoskamp Jun 4, 2025
4c9db2b
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jun 10, 2025
cd48517
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jun 12, 2025
0e4d5e9
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jun 13, 2025
4de1358
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jun 16, 2025
9cd447d
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jun 17, 2025
246db01
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jun 18, 2025
b80e6e4
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jun 18, 2025
8bf379c
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jun 19, 2025
decf027
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jun 19, 2025
a1f1405
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jun 20, 2025
313246e
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jun 20, 2025
5befd64
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jun 20, 2025
33d2ca8
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jun 23, 2025
ac46d2a
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jun 27, 2025
730718e
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jun 30, 2025
9da5202
merge
svenvoskamp Jul 1, 2025
ddd1b3d
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jul 1, 2025
5308a73
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jul 7, 2025
f33646b
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jul 7, 2025
e1b49ab
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jul 9, 2025
a18032b
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jul 22, 2025
22fcbe8
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Jul 25, 2025
ca16773
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Aug 1, 2025
fd7c100
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Aug 7, 2025
b333d2b
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Aug 8, 2025
11fc605
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Aug 18, 2025
a997028
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Aug 19, 2025
8eb99d2
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Aug 22, 2025
d5b512a
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Aug 25, 2025
7082b4c
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Aug 26, 2025
a4d6ebc
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Aug 29, 2025
96ec56e
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Aug 29, 2025
307940a
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Sep 1, 2025
b045dc7
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Sep 1, 2025
f3fbd48
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Sep 22, 2025
a8f3428
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Sep 23, 2025
ec1e825
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Sep 24, 2025
49833b8
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Sep 25, 2025
e52af2c
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Sep 25, 2025
8a57418
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Sep 30, 2025
7bbc6e4
merge
svenvoskamp Oct 6, 2025
b958437
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Oct 7, 2025
7242ba1
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Oct 7, 2025
d638907
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Oct 8, 2025
52868b5
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Oct 9, 2025
c346b51
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Oct 10, 2025
21285e1
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Oct 14, 2025
d06a510
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Oct 15, 2025
cd7f2ae
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Oct 16, 2025
5d638f9
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Oct 17, 2025
3a5a09d
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Oct 21, 2025
7e305d8
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Oct 23, 2025
9bfbf19
Merge branch 'main' of github.com:reown-com/appkit
svenvoskamp Dec 3, 2025
a712b98
fix: show correct icon for continue with a wallet button
svenvoskamp Dec 3, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/wet-hotels-repair.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@reown/appkit-scaffold-ui': patch
---

Fix an issue where the continue with wallet didn't show the correct icon
1 change: 1 addition & 0 deletions packages/scaffold-ui/src/views/w3m-connect-view/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ export class W3mConnectView extends LitElement {
if (hasOtherMethods && shouldCollapseWallets) {
return html`<wui-list-button
data-testid="w3m-collapse-wallets-button"
icon="wallet"
tabIdx=${ifDefined(tabIndex)}
@click=${this.onContinueWalletClick.bind(this)}
text="Continue with a wallet"
Expand Down
21 changes: 21 additions & 0 deletions packages/scaffold-ui/test/views/w3m-connect-view.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,27 @@ describe('W3mConnectView - Connection Methods', () => {
expect(HelpersUtil.querySelect(element, WALLET_LOGIN_LIST)).toBeNull()
})

it('should render collapse wallets button with wallet icon when collapseWallets is true', async () => {
vi.spyOn(OptionsController, 'state', 'get').mockReturnValue({
...OptionsController.state,
enableWallets: true,
features: {
connectMethodsOrder: ['wallet', 'email', 'social'],
collapseWallets: true
},
remoteFeatures: {
email: true,
socials: ['google']
}
})

const element: W3mConnectView = await fixture(html`<w3m-connect-view></w3m-connect-view>`)

const collapseButton = HelpersUtil.getByTestId(element, COLLAPSE_WALLETS_BUTTON)
expect(collapseButton).not.toBeNull()
expect(collapseButton?.getAttribute('icon')).toBe('wallet')
})

it('should render one separator between wallet and email/social group', async () => {
vi.spyOn(OptionsController, 'state', 'get').mockReturnValue({
...OptionsController.state,
Expand Down
Loading