fix merge conflcits

.coderabbit.yaml

@@ -11,11 +11,17 @@ reviews:
         "ALWAYS review Markdown content THOROUGHLY with the following criteria:
         - Use proper nouns in place of personal pronouns like 'We' and 'Our' to maintain consistency in communal documentation.
         - Avoid gender-specific language and use the imperative form.
-        - Monitor capitalization for emphasis. Use **bold** for prominence instead of all caps or italics.
+        - Monitor capitalization for emphasis. Avoid using all caps, italics, or bold for emphasis.
         - Ensure proper nouns are capitalized in sentences.
         - Apply the Oxford comma.
-        - Use proper title case for headers, buttons, tab names, page names, and links. Sentence case should be used for body content and short phrases, even in links.
+        - Use proper title case for buttons, tab names, page names, and links. Sentence case should be used for body content and short phrases, even in links.
         - Use correct spelling and grammar at all times (IMPORTANT).
+        - For H1, H2, and H3 headers:
+          1. Use sentence case, capitalizing only the first word.
+          2. Preserve the capitalization of proper nouns, technical terms, and acronyms as defined in the 'nouns.txt' file located in the root directory of the project.
+          3. Do not automatically lowercase words that appear in the 'nouns.txt' file, regardless of their position in the header.
+        - Flag any headers that seem to inconsistently apply these rules for manual review.
+        - When reviewing capitalization, always refer to the 'nouns.txt' file for the correct capitalization of proper nouns and technical terms specific to the project.
         "
   auto_review:
     enabled: true

.github/workflows/tutorials.yml

@@ -10,7 +10,7 @@ concurrency:
   cancel-in-progress: false
 
 jobs:
-  cross-dom-bridge-erc20:
+  cross-dom-bridge-eth:
     runs-on: ubuntu-latest
 
     steps:
@@ -32,7 +32,7 @@ jobs:
       env:
         TUTORIAL_PRIVATE_KEY: ${{ secrets.TUTORIAL_PRIVATE_KEY }}
       run:
-        node ./public/tutorials/cross-dom-bridge-erc20.js
+        node ./public/tutorials/cross-dom-bridge-eth.js
 
     - name: Notify Slack on failure
       uses: ravsamhq/notify-slack-action@v2
@@ -47,8 +47,8 @@ jobs:
       env:
         SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
 
-  cross-dom-bridge-eth:
-    needs: cross-dom-bridge-erc20
+  send-tx-from-eth:
+    needs: cross-dom-bridge-eth
     runs-on: ubuntu-latest
 
     steps:
@@ -70,7 +70,7 @@ jobs:
       env:
         TUTORIAL_PRIVATE_KEY: ${{ secrets.TUTORIAL_PRIVATE_KEY }}
       run:
-        node ./public/tutorials/cross-dom-bridge-eth.js
+        node ./public/tutorials/send-tx-from-eth.js
 
     - name: Notify Slack on failure
       uses: ravsamhq/notify-slack-action@v2
@@ -86,7 +86,7 @@ jobs:
         SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
 
   sdk-estimate-costs:
-    needs: cross-dom-bridge-eth
+    needs: send-tx-from-eth
     runs-on: ubuntu-latest
 
     steps:

components/WipCallout.tsx

@@ -10,12 +10,19 @@
  * `context` is not provided, it will display a default maintenance message.
  */
 import type { ReactElement } from 'react';
+import { useState } from 'react';
+
 interface Props {
   context?: string;
 }
 export function WipCallout({ context }: Props): ReactElement {
+  const [closeCallout, setCloseCallout] = useState(false);
   return (
-    <div className="custom-callouts nx-w-full nx-mt-6 nx-flex nx-justify-center nx-items-center nx-bg-white dark:nx-bg-black">
+    <div
+      className={`custom-callouts nx-w-full nx-mt-6 nx-flex nx-justify-center nx-items-center nx-bg-white dark:nx-bg-black ${
+        closeCallout && 'nx-hidden'
+      }`}
+    >
       <div className="nx-w-full  nx-px-4 nx-text-center nx-font-medium nx-text-sm nx-text-left">
         {context ? (
           context
@@ -34,6 +41,12 @@ export function WipCallout({ context }: Props): ReactElement {
           </div>
         )}
       </div>
+      <button
+        className="callout-close-btn"
+        onClick={() => setCloseCallout(true)}
+      >
+        x
+      </button>
     </div>
   );
 }
@@ -46,11 +59,12 @@ export function InfoCallout({ context }: Props): ReactElement {
           context
         ) : (
           <div className="nx-text-left">
-            Interop is currently in <strong>active development</strong> and not yet ready for production use. 
-            The information provided here may change frequently. 
+            Interop is currently in <strong>active development</strong> and not
+            yet ready for production use. The information provided here may
+            change frequently.
             <p>
-            We recommend checking back 
-            regularly for the most up-to-date information.
+              We recommend checking back regularly for the most up-to-date
+              information.
             </p>
           </div>
         )}
@@ -59,19 +73,35 @@ export function InfoCallout({ context }: Props): ReactElement {
   );
 }
 
-export function AltCallout({ context }: Props): ReactElement {
+interface BetaCalloutProps extends Props {
+  featureName: string;
+}
+
+function BetaCallout({ context, featureName }: BetaCalloutProps): ReactElement {
   return (
     <div className="custom-callouts nx-w-full nx-mt-6 nx-flex nx-justify-center nx-items-center nx-bg-white dark:nx-bg-black">
-      <div className="nx-w-full  nx-px-4 nx-text-center nx-font-medium nx-text-sm nx-text-left">
+      <div className="nx-w-full nx-px-4 nx-text-center nx-font-medium nx-text-sm nx-text-left">
         {context ? (
           context
         ) : (
-          <div className="nx-text-left">
-            The Alt-DA Mode feature is currently in <strong>Beta</strong>  within the MIT-licensed OP Stack. Beta features are built and reviewed by the Optimism Collective’s core contributors, and provide developers with early access to highly requested configurations.
-These features may experience stability issues, and we encourage feedback from our early users.
+          <div className="nx-text-left" role="alert" aria-live="polite">
+            The {featureName} feature is currently in <strong>Beta</strong> within
+            the MIT-licensed OP Stack. Beta features are built and reviewed by
+            the Optimism Collective's core contributors, and provide developers
+            with early access to highly requested configurations. These features
+            may experience stability issues, and we encourage feedback from our
+            early users.
           </div>
         )}
       </div>
     </div>
   );
 }
+
+export function AltCallout(props: Props): ReactElement {
+  return <BetaCallout {...props} featureName="Alt-DA Mode" />;
+}
+
+export function CGTCallout(props: Props): ReactElement {
+  return <BetaCallout {...props} featureName="Custom Gas Token" />;
+}