Skip to content

Commit

Permalink
Merge branch 'master' into feat/aa-gating
Browse files Browse the repository at this point in the history
  • Loading branch information
tanguyenvn committed Oct 10, 2024
2 parents f0fd439 + b0421f3 commit d251a8a
Show file tree
Hide file tree
Showing 42 changed files with 328 additions and 304 deletions.
196 changes: 98 additions & 98 deletions demo/vue-app-new/package-lock.json

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions demo/vue-app-new/src/MainView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ onBeforeMount(() => {
formData.chain = json.chain;
formData.chainNamespace = json.chainNamespace;
formData.loginProviders = json.loginProviders;
formData.showWalletDiscovery = json.showWalletDiscovery;
formData.network = json.network;
formData.whiteLabel = json.whiteLabel;
formData.walletPlugin = json.walletPlugin;
Expand Down Expand Up @@ -232,6 +233,7 @@ const configs = computed(() => {
web3AuthOptions: options.value,
plugins: walletPlugins.value,
modalConfig: modalParams.value,
hideWalletDiscovery: !formData.showWalletDiscovery,
};
});
</script>
Expand Down
9 changes: 9 additions & 0 deletions demo/vue-app-new/src/components/AppSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,15 @@ const onChainNamespaceChange = (value: string) => {
multiple
:show-check-box="true"
/>
<Toggle
v-model="formData.showWalletDiscovery"
data-testid="showWalletDiscovery"
:show-label="true"
:size="'small'"
:label-disabled="$t('app.showWalletDiscovery')"
:label-enabled="$t('app.showWalletDiscovery')"
class="mb-2"
/>
</Card>
<Card v-if="isActiveTab(1)" class="grid grid-cols-1 gap-2 px-4 py-4 sm:grid-cols-2" :shadow="false">
<Toggle
Expand Down
1 change: 1 addition & 0 deletions demo/vue-app-new/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ export type FormData = {
};
loginProviders: LOGIN_PROVIDER_TYPE[];
adapters: string[];
showWalletDiscovery: boolean;
loginMethods: Record<LOGIN_PROVIDER_TYPE, FormConfigSettings>;
walletPlugin: {
enable: boolean;
Expand Down
1 change: 1 addition & 0 deletions demo/vue-app-new/src/store/form.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export const formDataStore = reactive<FormData>({
},
loginProviders: [],
adapters: [],
showWalletDiscovery: true,
loginMethods: defaultLoginMethod,
walletPlugin: {
enable: false,
Expand Down
1 change: 1 addition & 0 deletions demo/vue-app-new/src/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"chain": "Chain",
"loginProviders": "Login provider",
"adapters": "Adapters",
"showWalletDiscovery": "Show Wallet Discovery",
"greeting": "Let's configure Web3Auth!",
"enableWalletServicePlugin": "Enable Wallet Service Plugin",
"walletPlugin": {
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"version": "9.2.0-alpha.8",
"version": "9.2.1",
"npmClient": "npm"
}
Loading

0 comments on commit d251a8a

Please sign in to comment.