Skip to content

Commit ea0170b

Browse files
arch1995arch1995
committed
Merge branch 'master' of github.com:Web3Auth/Web3Auth into feat/add-wagmi-support
2 parents b14e680 + 7270c72 commit ea0170b

File tree

35 files changed

+2888
-6229
lines changed

35 files changed

+2888
-6229
lines changed

‎demo/vue-app-new/package-lock.json‎

Lines changed: 5 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎demo/vue-app-new/src/components/AppSettings.vue‎

Lines changed: 27 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ const aaSupportedChains = computed(() => {
5151
.map((chainConfig) => ({ name: `${chainConfig!.chainId} ${chainConfig!.displayName}`, value: chainConfig!.chainId }));
5252
});
5353
54-
const adapterOptions = computed(() =>
55-
formData.chainNamespaces.includes(CHAIN_NAMESPACES.EIP155) ? [{ name: "coinbase-adapter", value: "coinbase" }] : []
54+
const connectorOptions = computed(() =>
55+
formData.chainNamespaces.includes(CHAIN_NAMESPACES.EIP155) ? [{ name: "coinbase-connector", value: "coinbase" }] : []
5656
);
5757
5858
const isDisplay = (_name: string): boolean => {
@@ -139,6 +139,7 @@ const onSmartAccountChainChange = (chainIds: string[]) => {
139139
data-testid="selectWidget"
140140
:aria-label="$t('app.widget.title')"
141141
:placeholder="$t('app.widget.title')"
142+
matchParentsWidth
142143
:options="[
143144
{ name: $t('app.widget.embed'), value: 'embed' },
144145
{ name: $t('app.widget.modal'), value: 'modal' },
@@ -182,6 +183,7 @@ const onSmartAccountChainChange = (chainIds: string[]) => {
182183
:aria-label="$t('app.network')"
183184
:placeholder="$t('app.network')"
184185
:options="networkOptions"
186+
matchParentsWidth
185187
/>
186188
<Select
187189
v-model="formData.chainNamespaces"
@@ -191,6 +193,7 @@ const onSmartAccountChainChange = (chainIds: string[]) => {
191193
:placeholder="$t('app.chainNamespaces')"
192194
:options="chainNamespaceOptions"
193195
:multiple="true"
196+
matchParentsWidth
194197
@update:model-value="onChainNamespaceChange"
195198
/>
196199
<Select
@@ -200,6 +203,7 @@ const onSmartAccountChainChange = (chainIds: string[]) => {
200203
:aria-label="$t('app.chains')"
201204
:placeholder="$t('app.chains')"
202205
:multiple="true"
206+
matchParentsWidth
203207
:options="chainOptions"
204208
@update:model-value="onChainChange"
205209
/>
@@ -209,16 +213,18 @@ const onSmartAccountChainChange = (chainIds: string[]) => {
209213
:label="$t('app.defaultChainId')"
210214
:aria-label="$t('app.defaultChainId')"
211215
:placeholder="$t('app.defaultChainId')"
216+
matchParentsWidth
212217
:options="defaultChainOptions"
213218
/>
214219
<Select
215220
v-model="formData.connectors"
216-
data-testid="selectAdapters"
217-
:label="$t('app.adapters')"
218-
:aria-label="$t('app.adapters')"
219-
:placeholder="$t('app.adapters')"
220-
:options="adapterOptions"
221+
data-testid="selectConnectors"
222+
:label="$t('app.connectors')"
223+
:aria-label="$t('app.connectors')"
224+
:placeholder="$t('app.connectors')"
225+
:options="connectorOptions"
221226
multiple
227+
matchParentsWidth
222228
:show-check-box="true"
223229
/>
224230
<Toggle
@@ -272,6 +278,7 @@ const onSmartAccountChainChange = (chainIds: string[]) => {
272278
:aria-label="$t('app.whiteLabel.defaultLanguage')"
273279
:placeholder="$t('app.whiteLabel.defaultLanguage')"
274280
:options="languageOptions"
281+
matchParentsWidth
275282
:disabled="isDisabled('whiteLabelSettings')"
276283
/>
277284
<TextField
@@ -351,17 +358,25 @@ const onSmartAccountChainChange = (chainIds: string[]) => {
351358
:placeholder="$t('app.loginProviders')"
352359
:options="loginProviderOptions"
353360
multiple
361+
matchParentsWidth
354362
class=""
355363
/>
356364
<Card v-for="p in formData.loginProviders" :key="p" :shadow="false" class="grid grid-cols-1 gap-2 px-4 py-4 sm:grid-cols-3">
357-
<div class="font-bold leading-tight text-left sm:col-span-2">{{ p }}</div>
365+
<div class="font-bold leading-tight text-left">{{ p }}</div>
358366
<Toggle
359367
v-model="formData.loginMethods[p].mainOption"
360368
:show-label="true"
361369
:size="'small'"
362370
:label-disabled="$t('app.loginMethod.mainOption')"
363371
:label-enabled="$t('app.loginMethod.mainOption')"
364372
/>
373+
<Toggle
374+
v-model="formData.loginMethods[p].showOnModal"
375+
:show-label="true"
376+
:size="'small'"
377+
:label-disabled="$t('app.loginMethod.showOnModal')"
378+
:label-enabled="$t('app.loginMethod.showOnModal')"
379+
/>
365380
<TextField
366381
v-model="formData.loginMethods[p].name"
367382
:label="$t('app.loginMethod.name')"
@@ -393,27 +408,6 @@ const onSmartAccountChainChange = (chainIds: string[]) => {
393408
:aria-label="$t('app.loginMethod.logoDark')"
394409
:placeholder="$t('app.loginMethod.logoDark')"
395410
/>
396-
<Toggle
397-
v-model="formData.loginMethods[p].showOnModal"
398-
:show-label="true"
399-
:size="'small'"
400-
:label-disabled="$t('app.loginMethod.showOnModal')"
401-
:label-enabled="$t('app.loginMethod.showOnModal')"
402-
/>
403-
<Toggle
404-
v-model="formData.loginMethods[p].showOnDesktop"
405-
:show-label="true"
406-
:size="'small'"
407-
:label-disabled="$t('app.loginMethod.showOnDesktop')"
408-
:label-enabled="$t('app.loginMethod.showOnDesktop')"
409-
/>
410-
<Toggle
411-
v-model="formData.loginMethods[p].showOnMobile"
412-
:show-label="true"
413-
:size="'small'"
414-
:label-disabled="$t('app.loginMethod.showOnMobile')"
415-
:label-enabled="$t('app.loginMethod.showOnMobile')"
416-
/>
417411
</Card>
418412
</Card>
419413
<Card v-if="isActiveTab(3)" class="grid grid-cols-1 gap-2 px-4 py-4" :shadow="false">
@@ -428,11 +422,11 @@ const onSmartAccountChainChange = (chainIds: string[]) => {
428422
/>
429423
<Select
430424
v-model="formData.walletPlugin.confirmationStrategy"
431-
data-testid="selectLoginProviders"
425+
data-testid="selectConfirmationStrategy"
432426
:label="$t('app.walletPlugin.confirmationStrategy')"
433427
:aria-label="$t('app.walletPlugin.confirmationStrategy')"
434428
:placeholder="$t('app.walletPlugin.confirmationStrategy')"
435-
:options="confirmationStrategyOptions"
429+
matchParentsWidth
436430
class=""
437431
/>
438432
</Card>
@@ -475,6 +469,7 @@ const onSmartAccountChainChange = (chainIds: string[]) => {
475469
:placeholder="$t('app.accountAbstractionProvider.smartAccountType')"
476470
:options="SmartAccountOptions"
477471
:disabled="isDisabled('smartAccountType')"
472+
matchParentsWidth
478473
/>
479474
<Select
480475
v-model="formData.smartAccountChains"
@@ -484,6 +479,7 @@ const onSmartAccountChainChange = (chainIds: string[]) => {
484479
:placeholder="$t('app.chains')"
485480
:options="aaSupportedChains"
486481
multiple
482+
matchParentsWidth
487483
:disabled="isDisabled('smartAccountChains')"
488484
@update:model-value="onSmartAccountChainChange"
489485
/>

‎demo/vue-app-new/src/config.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,7 @@ export const defaultLoginMethod: Record<AUTH_CONNECTION_TYPE, FormConfigSettings
7474
logoLight: "",
7575
logoDark: "",
7676
mainOption: false,
77-
showOnModal: false,
78-
showOnDesktop: false,
79-
showOnMobile: false,
77+
showOnModal: true,
8078
},
8179
}),
8280
{} as Record<AUTH_CONNECTION_TYPE, FormConfigSettings>

‎demo/vue-app-new/src/interfaces.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,4 @@ export interface FormConfigSettings {
66
logoDark: string;
77
mainOption: boolean;
88
showOnModal: boolean;
9-
showOnDesktop: boolean;
10-
showOnMobile: boolean;
119
}

‎demo/vue-app-new/src/translations/en.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"chains": "Chains",
99
"defaultChainId": "Default Chain ID",
1010
"loginProviders": "Login provider",
11-
"adapters": "Adapters",
11+
"connectors": "Connectors",
1212
"showWalletDiscovery": "Show Wallet Discovery",
1313
"multiInjectedProviderDiscovery": "Multi Injected Provider Discovery",
1414
"greeting": "Let's configure Web3Auth!",
@@ -47,9 +47,7 @@
4747
"logoLight": "Logo Light",
4848
"logoDark": "Logo Dark",
4949
"mainOption": "Main Option",
50-
"showOnModal": "on Modal?",
51-
"showOnDesktop": "on Desktop?",
52-
"showOnMobile": "on Mobile?"
50+
"showOnModal": "Show on Modal"
5351
},
5452
"adapter": {
5553
"sessionTime": "Session Time"

0 commit comments

Comments
 (0)