Merge branch 'master' into Traceye

README.md

@@ -86,18 +86,25 @@ If you're a builder who wants to add or update your project on the [Base Ecosyst
    ```json
    {
      "name": "Your Project Name",
-     "tags": ["category"],
      "description": "A brief description of your project (less than 200 characters)",
      "url": "https://your-project-url.com",
-     "imageUrl": "/images/partners/your-project-logo.png"
+     "imageUrl": "/images/partners/your-project-logo.png",
+     "category": "Your Project Category",
+     "subcategory": "Your Project Subcategory"
    }
    ```
 
    - name: Your project's name
-   - tags: An array with _one_ of the following categories: `bridge`, `dao`, `defi`, `gaming`, `infra`, `nft`, `onramp`, `social`, `wallet`, `security`
    - description: A brief description of your project, must be less than 200 characters
    - url: Your project's website URL
    - imageUrl: Path to your project's logo image
+   - category: Your project's category, _one_ of: `consumer`, `defi`, `infra`, `onramp`, `wallet`
+   - subcategory: Your project's subcategory, with the following options associated with each category
+      - `consumer`: _One_ of `creator`, `crypto taxes`, `dao`, `gaming`, `messaging`, `music`, `nft`, `payments`, `real world`, `social`
+      - `defi`: _One_ of `dex`, `dex aggregator`, `insurance`, `lending/borrowing`, `liquidity management`, `portfolio`, `stablecoin`, `yield vault`
+      - `infra`: _One_ of `ai`, `bridge`, `data`, `depin`, `developer tool`, `identity`, `node provider`, `raas`, `security`
+      - `onramp`: _One_ of `centralized exchange`, `fiat on-ramp`
+      - `wallet`: _One_ of `account abstraction`, `multisig`, `self-custody`
 
 4. When adding and/or updating a logo, place a 192x192 pixel PNG file in the `web/apps/web/public/images/partners/`. The file should be named appropriately (e.g., your-project-name.png). The logo should be an App Store or Play Store iconographic version, not a full wordmark.
 

apps/base-docs/base-learn/docs/deployment-to-testnet/deployment-to-base-sepolia-sbs.md

@@ -102,7 +102,7 @@ You now have the power to put smart contracts on the blockchain! You've only dep
 [coinbase]: https://www.coinbase.com/wallet
 [metamask]: https://metamask.io/
 [faucet]: https://docs.base.org/tools/network-faucets
-[set up]: https://www.youtube.com/watch?v=CZDgLG6jpgw
+[set up]: 
 [coinbase settings]: https://docs.cloud.coinbase.com/wallet-sdk/docs/developer-settings
 [Metamask Settings]: https://support.metamask.io/hc/en-us/articles/13946422437147-How-to-view-testnets-in-MetaMask
 [BaseScan]: https://sepolia.basescan.org/

apps/base-docs/base-learn/docs/introduction-to-solidity/deployment-in-remix.md

@@ -50,7 +50,7 @@ Click the chevron to expand your contract in the Deployed Contracts section of t
 
 ![Function Buttons](../../assets/images/introduction-to-solidity/remix-contract-buttons.png)
 
-Let's click the retrieve button first. Before clicking, make a prediction: given that the `number` variable was instantiated without a value, what do you thing the return will be?
+Let's click the retrieve button first. Before clicking, make a prediction: given that the `number` variable was instantiated without a value, what do you think the return will be?
 
 Go ahead and click – the result will appear below the button as:
 

apps/base-docs/base-learn/docs/introduction-to-solidity/introduction-to-remix.md

@@ -33,7 +33,7 @@ The editor pane loads with the Remix home screen, which contains news, helpful l
 
 ![Remix Editor](../../assets/images/introduction-to-solidity/editor-pane.png)
 
-You'll edit your code in the editor pane. It also has most of the features you're expecting, such as syntax and error highlighting. Note that in Remix, errors are not underlines. Instead, you'll see an❗to the left of the line number where the error is present.
+You'll edit your code in the editor pane. It also has most of the features you're expecting, such as syntax and error highlighting. Note that in Remix, errors are not underlined. Instead, you'll see an❗to the left of the line number where the error is present.
 
 At the top, you'll see a large green arrow similar to the _Run_ button in other editors. In Solidity, this compiles your code, but it does not run it because you must first deploy your code to the simulated blockchain.
 

apps/base-docs/docs/terms-of-service.md

@@ -145,7 +145,7 @@ These Terms shall not be construed to waive rights that cannot be waived under a
 
 Coinbase is an independent contractor for all purposes. Nothing in these Terms is intended to or shall operate to create a partnership or joint venture between you and Coinbase, or authorize you to act as agent of Coinbase. These Terms are not intended to, and do not, create or impose any fiduciary duties on us. To the fullest extent permitted by law, you acknowledge and agree that we owe no fiduciary duties or liabilities to you or any other party, and that to the extent any such duties or liabilities may exist at law or in equity, those duties and liabilities are hereby irrevocably disclaimed, waived, and foregone. You further agree that the only duties and obligations that we owe you are those set out expressly in these Terms.
 
-### 26. Dispute Resolution, Arbitration Agreement, Class Action Waiver, And Jury Trial Waiver
+### 27. Dispute Resolution, Arbitration Agreement, Class Action Waiver, And Jury Trial Waiver
 
 If you have a dispute with us, you agree to first contact Coinbase Support via our Customer Support page (https://help.coinbase.com). If Coinbase Support is unable to resolve your dispute, you agree to follow our Formal Complaint Process. You begin this process by submitting our [complaint form](https://help.coinbase.com/en/coinbase/other-topics/other/how-to-send-a-complaint). If you would prefer to send a written complaint via mail, please include as much information as possible in describing your complaint, including your support ticket number, how you would like us to resolve the complaint, and any other relevant information to us at 82 Nassau St #61234, New York, NY 10038. The Formal Complaint Process is completed when Coinbase responds to your complaint or 45 business days after the date we receive your complaint, whichever occurs first. You agree to complete the Formal Complaint Process before filing an arbitration demand or action in small claims court.
 

apps/base-docs/tutorials/docs/0_deploy-with-remix.md

@@ -224,7 +224,7 @@ You now have the power to put smart contracts on the blockchain! You've only dep
 [`basescan.org`]: https://basescan.org/
 [coinbase]: https://www.coinbase.com/wallet
 [MetaMask]: https://metamask.io/
-[set up]: https://www.youtube.com/watch?v=CZDgLG6jpgw
+[set up]: 
 [coinbase settings]: https://docs.cloud.coinbase.com/wallet-sdk/docs/developer-settings
 [BaseScan]: https://sepolia.basescan.org/
 [faucets on the web]: https://coinbase.com/faucets

apps/bridge/src/components/Nav/DesktopNav.tsx

@@ -119,7 +119,7 @@ function IconLink({
 
 function DesktopNav({ color }: DesktopNavProps) {
   return (
-    <div className="hidden h-full w-fit flex-grow flex-row items-center justify-between lg:flex">
+    <div className="hidden h-full w-fit flex-grow items-center justify-between lg:flex">
       <Dropdown label="Ecosystem" color={color}>
         <DropdownLink href="https://base.org/ecosystem" label="Apps" color={color} />
         <DropdownLink

apps/web/src/data/ecosystem.json

@@ -1,10 +1,11 @@
 [
   {
     "name": "MADNFT",
-    "tags": ["nft"],
     "description": "MADNFT is a creator-first NFT platform empowering artists, collectors, and communities with tools to mint, list, and engage while earning XP points and rewards.",
     "url": "https://madnft.io",
-    "imageUrl": "/images/partners/madnft.png"
+    "imageUrl": "/images/partners/madnft.png",
+    "category": "consumer",
+    "subcategory": "nft"
   },
   {
     "name": "Coinbase",