Skip to content

Commit d7ef6a3

Browse files
yashovardhanyashovardhan
authored
Merge branch 'master' into paymaster-context
2 parents 255d941 + cf1db33 commit d7ef6a3

File tree

10 files changed

+58
-37
lines changed

10 files changed

+58
-37
lines changed

‎docs/features/wallet-ui.mdx‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,13 @@ you can use this feature for projects on `sapphire_devnet` for free.
1717

1818
:::
1919

20+
:::note
21+
22+
From the **v9.5.0 release**, the Embedded Wallet UI supports both Externally Owned Accounts (EOA)
23+
and Account Abstraction (AA) accounts in the Wallet Services.
24+
25+
:::
26+
2027
## Enhancing User Experience with Embedded Wallet UI
2128

2229
Web3Auth's Embedded Wallet UI service is engineered to blend effortlessly into your application,

‎docs/sdk/mpc-core-kit/mpc-core-kit-js/mpc-core-kit-js.mdx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ device seamlessly without having to generate a new factor.
163163

164164
## Resources
165165

166-
- [Quick Start](/quick-start?product=CORE_KIT&sdk=MPC_CORE_KIT&framework=REACT&stepIndex=0): Get
167-
Started with an easy to follow integration of Web3Auth
166+
- [Quick Start](/quick-start?product=MPC_CORE_KIT&sdk=MPC_CORE_KIT_WEB&framework=REACT&stepIndex=0&stepIndex=0):
167+
Get Started with an easy to follow integration of Web3Auth
168168

169169
- [Example Applications](/examples?product=Core+Kit&sdk=MPC+Core+Kit): Explore our example
170170
applications and try the SDK yourself.

‎docs/sdk/sfa/sfa-android/sfa-android.mdx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ SDKs. You can use this SDK with all features enabled in `sapphire_devnet` for fr
3232

3333
## Resources
3434

35-
- [Quick Start](/quick-start?product=CORE_KIT&sdk=SFA_ANDROID&framework=ANDROID&stepIndex=0): Get
36-
Started with an easy to follow integration of Web3Auth
35+
- [Quick Start](/quick-start?product=SFA&sdk=SFA_ANDROID&framework=ANDROID&stepIndex=0): Get Started
36+
with an easy to follow integration of Web3Auth
3737

3838
- [Example Applications](/examples?product=Core+Kit&sdk=Single+Factor+Auth+Android+SDK): Explore our
3939
example applications and try the SDK yourself.

‎docs/sdk/sfa/sfa-flutter/sfa-flutter.mdx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ SDKs. You can use this SDK with all features enabled in `sapphire_devnet` for fr
3333

3434
## Resources
3535

36-
- [Quick Start](/quick-start?product=CORE_KIT&sdk=SFA_FLUTTER&framework=IOS&stepIndex=0): Get
37-
Started with an easy to follow integration of Web3Auth
36+
- [Quick Start](/quick-start?product=SFA&sdk=SFA_FLUTTER&framework=IOS&stepIndex=0): Get Started
37+
with an easy to follow integration of Web3Auth
3838

3939
- [Example Applications](/examples?product=Core+Kit&sdk=Single+Factor+Auth+Flutter+SDK): Explore our
4040
example applications and try the SDK yourself.

‎docs/sdk/sfa/sfa-ios/sfa-ios.mdx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ SDKs. You can use this SDK with all features enabled in `sapphire_devnet` for fr
3535

3636
## Resources
3737

38-
- [Quick Start](/quick-start?product=CORE_KIT&sdk=SFA_IOS&framework=IOS&stepIndex=0): Get Started
39-
with an easy to follow integration of Web3Auth
38+
- [Quick Start](/quick-start?product=SFA&sdk=SFA_IOS&framework=IOS&stepIndex=0): Get Started with an
39+
easy to follow integration of Web3Auth
4040

4141
- [Example Applications](/examples?product=Core+Kit&sdk=Single+Factor+Auth+iOS+SDK): Explore our
4242
example applications and try the SDK yourself.

‎docs/sdk/sfa/sfa-js/sfa-js.mdx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ SDKs. You can use this SDK with all features enabled in `sapphire_devnet` for fr
3737

3838
## Resources
3939

40-
- [Quick Start](/quick-start?product=CORE_KIT&sdk=SFA_WEB&framework=REACT&stepIndex=0): Get Started
41-
with an easy-to-follow integration of Web3Auth
40+
- [Quick Start](/quick-start?product=SFA&sdk=SFA_WEB&framework=REACT&stepIndex=0): Get Started with
41+
an easy-to-follow integration of Web3Auth
4242

4343
- [Example Applications](/examples?product=Core+Kit&sdk=Single+Factor+Auth+JS+SDK): Explore our
4444
example applications and try the SDK yourself.

‎src/common/maps.tsx‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1523,7 +1523,7 @@ export const coreKitSfaWebExamples: ExamplesInterface[] = [
15231523
link: quickStartHostedLinks.SFA_WEB_REACT,
15241524
githubLink: quickStartSourceCode.SFA_WEB_REACT,
15251525
id: "sfa-react-quick-start",
1526-
qsLink: "/quick-start?product=CORE_KIT&sdk=SFA_WEB&framework=REACT&stepIndex=0",
1526+
qsLink: "/quick-start?product=SFA&sdk=SFA_WEB&framework=REACT&stepIndex=0",
15271527
},
15281528
{
15291529
title: "Single Factor Auth Angular Quick Start",
@@ -1543,7 +1543,7 @@ export const coreKitSfaWebExamples: ExamplesInterface[] = [
15431543
link: quickStartHostedLinks.SFA_WEB_ANGULAR,
15441544
githubLink: quickStartSourceCode.SFA_WEB_ANGULAR,
15451545
id: "sfa-angular-quick-start",
1546-
qsLink: "/quick-start?product=CORE_KIT&sdk=SFA_WEB&framework=ANGULAR&stepIndex=0",
1546+
qsLink: "/quick-start?product=SFA&sdk=SFA_WEB&framework=ANGULAR&stepIndex=0",
15471547
},
15481548
{
15491549
title: "Single Factor Auth Vue Quick Start",
@@ -1554,7 +1554,7 @@ export const coreKitSfaWebExamples: ExamplesInterface[] = [
15541554
link: quickStartHostedLinks.SFA_WEB_VUE,
15551555
githubLink: quickStartSourceCode.SFA_WEB_VUE,
15561556
id: "sfa-vue-quick-start",
1557-
qsLink: "/quick-start?product=CORE_KIT&sdk=SFA_WEB&framework=VUE&stepIndex=0",
1557+
qsLink: "/quick-start?product=SFA&sdk=SFA_WEB&framework=VUE&stepIndex=0",
15581558
},
15591559
{
15601560
title: "Single Factor Auth NextJS Quick Start",
@@ -1574,7 +1574,7 @@ export const coreKitSfaWebExamples: ExamplesInterface[] = [
15741574
link: quickStartHostedLinks.SFA_WEB_NEXTJS,
15751575
githubLink: quickStartSourceCode.SFA_WEB_NEXTJS,
15761576
id: "sfa-nextjs-quick-start",
1577-
qsLink: "/quick-start?product=CORE_KIT&sdk=SFA_WEB&framework=NEXTJS&stepIndex=0",
1577+
qsLink: "/quick-start?product=SFA&sdk=SFA_WEB&framework=NEXTJS&stepIndex=0",
15781578
},
15791579
{
15801580
title: "Single Factor Auth Vanilla JS Quick Start",
@@ -1585,7 +1585,7 @@ export const coreKitSfaWebExamples: ExamplesInterface[] = [
15851585
link: quickStartHostedLinks.SFA_WEB_HTML,
15861586
githubLink: quickStartSourceCode.SFA_WEB_HTML,
15871587
id: "sfa-vanillajs-quick-start",
1588-
qsLink: "/quick-start?product=CORE_KIT&sdk=SFA_WEB&framework=HTML&stepIndex=0",
1588+
qsLink: "/quick-start?product=SFA&sdk=SFA_WEB&framework=HTML&stepIndex=0",
15891589
},
15901590
{
15911591
title: "Use Aggregate Verifiers in Single Factor Auth SDK",
@@ -1730,7 +1730,7 @@ export const coreKitSfaiOSExamples: ExamplesInterface[] = [
17301730
link: "https://github.com/Web3Auth/web3auth-core-kit-examples/tree/main/single-factor-auth-ios/sfa-ios-quick-start",
17311731
id: "sfa-ios-quick-start",
17321732
githubLink: quickStartSourceCode.SFA_IOS,
1733-
qsLink: "/quick-start?product=CORE_KIT&sdk=SFA_IOS&framework=IOS&stepIndex=0",
1733+
qsLink: "/quick-start?product=SFA&sdk=SFA_IOS&framework=IOS&stepIndex=0",
17341734
},
17351735
];
17361736
export const coreKitSfaAndroidExamples: ExamplesInterface[] = [
@@ -1743,7 +1743,7 @@ export const coreKitSfaAndroidExamples: ExamplesInterface[] = [
17431743
link: quickStartHostedLinks.SFA_ANDROID_ANDROID,
17441744
id: "sfa-ios-quick-start",
17451745
githubLink: quickStartSourceCode.SFA_ANDROID,
1746-
qsLink: "/quick-start?product=CORE_KIT&sdk=SFA_ANDROID&framework=ANDROID&stepIndex=0",
1746+
qsLink: "/quick-start?product=SFA&sdk=SFA_ANDROID&framework=ANDROID&stepIndex=0",
17471747
},
17481748
];
17491749
export const coreKitSfaNodeExamples: ExamplesInterface[] = [
@@ -1756,7 +1756,7 @@ export const coreKitSfaNodeExamples: ExamplesInterface[] = [
17561756
tags: [tags.sfa, "sfa", tags.node, tags.evm],
17571757
link: "https://github.com/Web3Auth/web3auth-core-kit-examples/tree/main/single-factor-auth-node/sfa-node-quick-start",
17581758
githubLink: quickStartSourceCode.SFA_NODE,
1759-
qsLink: "/quick-start?product=CORE_KIT&sdk=SFA_NODE&framework=NODE&stepIndex=0",
1759+
qsLink: "/quick-start?product=SFA&sdk=SFA_NODE&framework=NODE&stepIndex=0",
17601760
},
17611761
{
17621762
id: "sfa-telegram-oauth-server",
@@ -1803,7 +1803,7 @@ export const coreKitSfaReactNativeExamples: ExamplesInterface[] = [
18031803
tags: [tags.sfa, "sfa", "javascript", tags.android, tags.ios, tags.evm, tags.reactNative],
18041804
link: quickStartHostedLinks.SFA_REACT_NATIVE_IOS,
18051805
githubLink: quickStartSourceCode.SFA_REACT_NATIVE,
1806-
qsLink: "/quick-start?product=CORE_KIT&sdk=SFA_REACT_NATIVE&framework=IOS&stepIndex=0",
1806+
qsLink: "/quick-start?product=SFA&sdk=SFA_REACT_NATIVE&framework=IOS&stepIndex=0",
18071807
},
18081808
{
18091809
id: "sfa-rn-expo-auth0-example",
@@ -1828,7 +1828,7 @@ export const coreKitSfaFlutterExamples: ExamplesInterface[] = [
18281828
tags: [tags.sfa, "sfa", tags.flutter, tags.ios, tags.android, tags.evm, "dart"],
18291829
link: quickStartHostedLinks.SFA_FLUTTER_ANDROID,
18301830
githubLink: quickStartSourceCode.SFA_FLUTTER,
1831-
qsLink: "/quick-start?product=CORE_KIT&sdk=SFA_FLUTTER&framework=ANDROID&stepIndex=0",
1831+
qsLink: "/quick-start?product=SFA&sdk=SFA_FLUTTER&framework=ANDROID&stepIndex=0",
18321832
},
18331833
{
18341834
id: "sfa_flutter_solana",
@@ -1863,7 +1863,7 @@ export const coreKitMPCWebExamples: ExamplesInterface[] = [
18631863
githubLink: quickStartSourceCode.MPC_CORE_KIT_WEB_REACT,
18641864
id: "mpc-core-kit-react-quick-start",
18651865
qsLink:
1866-
"/quick-start?product=CORE_KIT&sdk=MPC_CORE_KIT&framework=REACT&stepIndex=0&stepIndex=0",
1866+
"/quick-start?product=MPC_CORE_KIT&sdk=MPC_CORE_KIT_WEB&framework=REACT&stepIndex=0&stepIndex=0",
18671867
},
18681868
{
18691869
title: "MPC Core Kit Angular Quick Start",
@@ -1884,7 +1884,7 @@ export const coreKitMPCWebExamples: ExamplesInterface[] = [
18841884
githubLink: quickStartSourceCode.MPC_CORE_KIT_WEB_ANGULAR,
18851885
id: "mpc-core-kit-angular-quick-start",
18861886
qsLink:
1887-
"/quick-start?product=CORE_KIT&sdk=MPC_CORE_KIT&framework=ANGULAR&stepIndex=0&stepIndex=0",
1887+
"/quick-start?product=MPC_CORE_KIT&sdk=MPC_CORE_KIT_WEB&framework=ANGULAR&stepIndex=0&stepIndex=0",
18881888
},
18891889
{
18901890
title: "MPC Core Kit Vue Quick Start",
@@ -1904,7 +1904,8 @@ export const coreKitMPCWebExamples: ExamplesInterface[] = [
19041904
link: quickStartHostedLinks.MPC_CORE_KIT_WEB_VUE,
19051905
githubLink: quickStartSourceCode.MPC_CORE_KIT_WEB_VUE,
19061906
id: "mpc-core-kit-vue-quick-start",
1907-
qsLink: "/quick-start?product=CORE_KIT&sdk=MPC_CORE_KIT&framework=VUE&stepIndex=0&stepIndex=0",
1907+
qsLink:
1908+
"/quick-start?product=MPC_CORE_KIT&sdk=MPC_CORE_KIT_WEB&framework=VUE&stepIndex=0&stepIndex=0",
19081909
},
19091910
{
19101911
title: "MPC Core Kit NextJS Quick Start",
@@ -1925,7 +1926,7 @@ export const coreKitMPCWebExamples: ExamplesInterface[] = [
19251926
githubLink: quickStartSourceCode.MPC_CORE_KIT_WEB_NEXTJS,
19261927
id: "mpc-core-kit-nextjs-quick-start",
19271928
qsLink:
1928-
"/quick-start?product=CORE_KIT&sdk=MPC_CORE_KIT&framework=NEXTJS&stepIndex=0&stepIndex=0",
1929+
"/quick-start?product=MPC_CORE_KIT&sdk=MPC_CORE_KIT_WEB&framework=NEXTJS&stepIndex=0&stepIndex=0",
19291930
},
19301931
{
19311932
title: "Use Aggregate Verifiers in MPC Core Kit SDK",

‎src/components/ProductCards/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ export default function QuickNavigation() {
442442
<span className={styles.pill}>Demo{chevron}</span>
443443
</a>
444444
<a
445-
href={`${baseUrl}quick-start?product=CORE_KIT&sdk=SFA_WEB`}
445+
href={`${baseUrl}quick-start?product=SFA&sdk=SFA_WEB`}
446446
className={styles.pillContainer}
447447
>
448448
<span className={styles.pill}>Quick Start{chevron}</span>

‎src/components/SDKReferenceCards/index.tsx‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -586,9 +586,7 @@ export const sfaweb = (
586586
<div className={styles.cardContentText}>
587587
<h3 className={styles.title}>Single Factor Auth JS SDK</h3>
588588
<div className={styles.links}>
589-
<a
590-
href={`${baseUrl}quick-start?product=CORE_KIT&sdk=SFA_WEB&framework=REACT&stepIndex=0`}
591-
>
589+
<a href={`${baseUrl}quick-start?product=SFA&sdk=SFA_WEB&framework=REACT&stepIndex=0`}>
592590
Quick Start{chevron}
593591
</a>
594592
<a href={`${baseUrl}sdk/sfa/sfa-js`}>SDK Reference{chevron}</a>
@@ -632,7 +630,7 @@ export const sfamobile = (
632630
</div>
633631
<div className={styles.links}>
634632
<a
635-
href={`${baseUrl}quick-start?product=CORE_KIT&sdk=SFA_ANDROID&framework=ANDROID&stepIndex=0&stepIndex=0`}
633+
href={`${baseUrl}quick-start?product=SFA&sdk=SFA_ANDROID&framework=ANDROID&stepIndex=0&stepIndex=0`}
636634
>
637635
Quick Start{chevron}
638636
</a>
@@ -665,7 +663,7 @@ export const sfamobile = (
665663
</div>
666664
<div className={styles.links}>
667665
<a
668-
href={`${baseUrl}quick-start?product=CORE_KIT&sdk=SFA_IOS&framework=IOS&stepIndex=0&stepIndex=0`}
666+
href={`${baseUrl}quick-start?product=SFA&sdk=SFA_IOS&framework=IOS&stepIndex=0&stepIndex=0`}
669667
>
670668
Quick Start{chevron}
671669
</a>
@@ -694,7 +692,7 @@ export const sfamobile = (
694692
<h3 className={styles.title}>Single Factor Auth Flutter SDK</h3>
695693
<div className={styles.links}>
696694
<a
697-
href={`${baseUrl}quick-start?product=CORE_KIT&sdk=SFA_FLUTTER&framework=IOS&stepIndex=0&stepIndex=0`}
695+
href={`${baseUrl}quick-start?product=SFA&sdk=SFA_FLUTTER&framework=IOS&stepIndex=0&stepIndex=0`}
698696
>
699697
Quick Start{chevron}
700698
</a>
@@ -746,7 +744,7 @@ export const mpccorekitjs = (
746744
</p>
747745
<div className={styles.links}>
748746
<a
749-
href={`${baseUrl}quick-start?product=CORE_KIT&sdk=MPC_CORE_KIT&framework=REACT&stepIndex=0&stepIndex=0`}
747+
href={`${baseUrl}quick-start?product=MPC_CORE_KIT&sdk=MPC_CORE_KIT_WEB&framework=REACT&stepIndex=0&stepIndex=0`}
750748
>
751749
Quick Start{chevron}
752750
</a>

‎src/pages/quick-start/builder/index.ts‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import {
3333
MPC_CORE_KIT_REACT_NATIVE,
3434
SFA,
3535
LANGS_WEB_PNP,
36+
MPC_CORE_KIT,
3637
} from "./choices";
3738
import mpc_core_kit_web_angular from "./mpc_core_kit/web/angular";
3839
import mpc_core_kit_web_nextjs from "./mpc_core_kit/web/nextjs";
@@ -166,12 +167,24 @@ const builder: IntegrationBuilder = {
166167

167168
let sdkDefault, sdkChoices, frameworkDefault, frameworkChoices;
168169

169-
if (finalValues.product === PNP) {
170-
sdkChoices = SDKS_PNP;
171-
} else if (finalValues.product === SFA) {
170+
if (finalValues.product === SFA) {
172171
sdkChoices = SDKS_SFA;
173-
} else {
172+
} else if (finalValues.product === MPC_CORE_KIT) {
173+
sdkChoices = SDKS_MPC_CORE_KIT;
174+
} else if (
175+
finalValues.product === "CORE_KIT" &&
176+
SDKS_SFA.some((sdk) => sdk.key === finalValues.sdk)
177+
) {
178+
finalValues.product = SFA;
179+
sdkChoices = SDKS_SFA;
180+
} else if (
181+
finalValues.product === "CORE_KIT" &&
182+
SDKS_MPC_CORE_KIT.some((sdk) => sdk.key === finalValues.sdk)
183+
) {
184+
finalValues.product = MPC_CORE_KIT;
174185
sdkChoices = SDKS_MPC_CORE_KIT;
186+
} else {
187+
sdkChoices = SDKS_PNP;
175188
}
176189

177190
switch (finalValues.sdk) {
@@ -226,10 +239,12 @@ const builder: IntegrationBuilder = {
226239
default:
227240
frameworkChoices = LANGS_WEB;
228241
}
229-
230242
sdkDefault = sdkChoices[0].key;
231243
frameworkDefault = frameworkChoices[0].key;
232244

245+
if (!sdkChoices.map((item) => item.key).includes(finalValues.sdk)) {
246+
finalValues.sdk = sdkDefault;
247+
}
233248
if (!frameworkChoices.map((item) => item.key).includes(finalValues.framework)) {
234249
finalValues.framework = frameworkDefault;
235250
}

0 commit comments

Comments
 (0)