diff --git a/docs/base-account/basenames/basenames-faq.mdx b/docs/base-account/basenames/basenames-faq.mdx
index 81031fcfd..905f60893 100644
--- a/docs/base-account/basenames/basenames-faq.mdx
+++ b/docs/base-account/basenames/basenames-faq.mdx
@@ -107,7 +107,7 @@ Currently, only one address at a time can be linked to a Basename. However, we p
### 14. I am a builder. How do I integrate Basenames to my app?
-If you're a builder looking to integrate Basenames into your app, [OnchainKit](https://onchainkit.xyz/wallet/wallet-dropdown-basename) is the easiest way to get started (tutorial [here](https://docs.base.org/identity/basenames/basenames-onchainkit-tutorial)). If you have ideas for new features or badges that you'd like to integrate with Basenames, we'd love to [hear from you](https://app.deform.cc/form/b9c1c39f-f238-459e-a765-5093ca638075/?page_number=0).
+If you're a builder looking to integrate Basenames into your app, follow the [Basenames + Wagmi tutorial](/base-account/basenames/basenames-wagmi-tutorial) to get started. If you have ideas for new features or badges that you'd like to integrate with Basenames, we'd love to [hear from you](https://app.deform.cc/form/b9c1c39f-f238-459e-a765-5093ca638075/?page_number=0).
### 15. How do I get a Basename for my app or project?
diff --git a/docs/base-account/basenames/basenames-onchainkit-tutorial.mdx b/docs/base-account/basenames/basenames-onchainkit-tutorial.mdx
deleted file mode 100644
index e9ecfbd97..000000000
--- a/docs/base-account/basenames/basenames-onchainkit-tutorial.mdx
+++ /dev/null
@@ -1,91 +0,0 @@
----
-title: Basenames + OnchainKit Tutorial
-slug: /basenames/basenames-onchainkit-tutorial
-description: 'A tutorial that teaches how to integrate Basenames to your wagmi/viem App using OnchainKit'
-author: hughescoin
----
-
-# Add Basenames to your wagmi/viem App using OnchainKit
-
-Basenames is now live! But what exactly is it? Basenames allows users to register human-readable names for their addresses and serves as a foundational building block for onchain identity. Think of it as your favorite social media handle, but even bigger. Your Basename is multichain by default and yours forever—no platform can take it away from you (just make sure to pay your fee).
-
-Integrating Basenames into your onchain app enhances the user experience by masking complex wallet addresses. Just as domains simplify IP addresses, Basenames do the same for wallet addresses.
-
-OnchainKit is a React component library designed to make building Onchain applications easier. In this tutorial, we'll use the `` component to resolve Basenames.
-
-This demo uses Coinbase Base Account and Coinbase Wallet, but Basenames is supported across many [other wallets].
-
-## Objectives
-
-By the end of this tutorial, you should be able to:
-
-- Understand how onchain identity works on the Base network
-- Enable users to use their onchain identity in your app using [OnchainKit]
-
----
-
-If you're starting from scratch, you'll need to create a new wagmi project. If you already have an existing wagmi project, you can skip ahead to the section on installing OnchainKit.
-
-To create a new wagmi project using TypeScript and install the required dependencies, run the following command:
-
-```bash
-bun create wagmi
-```
-
-Next, you'll need to install OnchainKit. Run the following command:
-
-```bash
-bun add @coinbase/onchainkit
-```
-
-After adding OnchainKit, install all dependencies and start your development server with:
-
-```
-bun install && bun run dev
-```
-
-This command will install the necessary dependencies and start a development server.
-
-To follow along with the tutorial effectively, open your web browser and your IDE side by side. This setup will allow you to code and see the changes in real time.
-
-### Update Wagmi config
-
-In this section, we will configure your wagmi project to support the Base blockchain by importing the necessary modules.
-
-Start by importing the `base` and `baseSepolia` chains into your wagmi config. Navigate to `src/wagmi.ts` and update the file as follows:
-
-```typescript wagmi.ts
-import { http, cookieStorage, createConfig, createStorage } from 'wagmi';
-import { base, baseSepolia } from 'wagmi/chains';
-import { coinbaseWallet, injected } from 'wagmi/connectors';
-
-export function getConfig() {
- return createConfig({
- chains: [base, baseSepolia],
- connectors: [
- injected(),
- coinbaseWallet({
- appName: 'Create Wagmi',
- preference: 'smartWalletOnly',
- }),
- ],
- storage: createStorage({
- storage: cookieStorage,
- }),
- ssr: true,
- transports: {
- [base.id]: http(),
- [baseSepolia.id]: http(),
- },
- });
-}
-
-declare module 'wagmi' {
- interface Register {
- config: ReturnType;
- }
-}
-```
-
-This configuration sets up the wagmi project to connect to the Base and BaseSepolia networks, utilizing Coinbase Wallet and other connectors.
-
diff --git a/docs/base-account/basenames/basenames-wagmi-tutorial.mdx b/docs/base-account/basenames/basenames-wagmi-tutorial.mdx
index ca0667d3d..01279146b 100644
--- a/docs/base-account/basenames/basenames-wagmi-tutorial.mdx
+++ b/docs/base-account/basenames/basenames-wagmi-tutorial.mdx
@@ -86,7 +86,7 @@ In your project folder, create the apis directory and add a basenames.tsx file:
`convertReverseNodeToBytes()`: This function is creating the reverse node so we can look up a name given an address. Each address gets its own reverse record in our registry that's created in a deterministic way.
-You can see the implementation of `convertReverseNodeToBytes()` in the [OnchainKit repo]
+You can see the implementation of `convertReverseNodeToBytes()` on [GitHub](https://github.com/coinbase/onchainkit/blob/main/packages/onchainkit/src/identity/utils/convertReverseNodeToBytes.ts)
`BasenameTextRecordKeys`: Metadata (e.g., github, twitter, etc.) are stored as text records so we can look them up based on the enum key.
@@ -217,8 +217,6 @@ In this example, the Home component fetches Basename data and displays it in bot
Congratulations! You've successfully integrated Basenames into your project. By setting up the necessary ABI, configuring your wagmi project, and implementing custom functions to resolve and display Basenames, you've enhanced your app's user experience by making wallet addresses more user-friendly. Your users can now enjoy a personalized, recognizable onchain identity across the Base network. Keep exploring and building to unlock even more possibilities with Basenames!
[Basenames]: https://www.base.org/names/
-[OnchainKit]: https://onchainkit.xyz/
[L2ResolverAbi]: https://gist.github.com/hughescoin/adf1c90b67cd9b2b913b984a2cc98de9
[basenames.tsx]: https://gist.github.com/hughescoin/95b680619d602782396fa954e981adae
-[OnchainKit repo]: https://github.com/coinbase/onchainkit/blob/main/src/identity/utils/convertReverseNodeToBytes.ts
diff --git a/docs/base-account/improve-ux/sub-accounts.mdx b/docs/base-account/improve-ux/sub-accounts.mdx
index c80ec9fba..0084b4913 100644
--- a/docs/base-account/improve-ux/sub-accounts.mdx
+++ b/docs/base-account/improve-ux/sub-accounts.mdx
@@ -7,7 +7,7 @@ import { GithubRepoCard } from "/snippets/GithubRepoCard.mdx"
## What are Sub Accounts?
-Sub Accounts allow you to provision app-specific wallet accounts for your users that are embedded directly in your application. Once created, you can interact with them just as you would with any other wallet via the wallet provider or popular onchain libraries like OnchainKit, wagmi, and viem.
+Sub Accounts allow you to provision app-specific wallet accounts for your users that are embedded directly in your application. Once created, you can interact with them just as you would with any other wallet via the wallet provider or popular onchain libraries like wagmi and viem.
Looking for a full implementation? Jump to the [Complete Integration Example](/base-account/improve-ux/sub-accounts#complete-integration-example).
diff --git a/docs/base-account/llms-full.txt b/docs/base-account/llms-full.txt
index f9a9bd05f..5618fa5be 100644
--- a/docs/base-account/llms-full.txt
+++ b/docs/base-account/llms-full.txt
@@ -72,7 +72,6 @@ const { status } = await getPaymentStatus({ id })
### Basenames
- [FAQ](https://docs.base.org/base-account/basenames/basenames-faq.md)
- [Transfer](https://docs.base.org/base-account/basenames/basename-transfer.md)
-- [OnchainKit Tutorial](https://docs.base.org/base-account/basenames/basenames-onchainkit-tutorial.md)
- [Wagmi Tutorial](https://docs.base.org/base-account/basenames/basenames-wagmi-tutorial.md)
### Contribute
diff --git a/docs/docs.json b/docs/docs.json
index 2daa9e481..2c4c70279 100644
--- a/docs/docs.json
+++ b/docs/docs.json
@@ -1104,6 +1104,14 @@
]
},
"redirects": [
+ {
+ "source": "/basenames/basenames-onchainkit-tutorial",
+ "destination": "/base-account/basenames/basenames-wagmi-tutorial"
+ },
+ {
+ "source": "/identity/basenames/basenames-onchainkit-tutorial",
+ "destination": "/base-account/basenames/basenames-wagmi-tutorial"
+ },
{
"source": "/base-chain/quickstart/bridge-token",
"destination": "/base-chain/network-information/bridges"