diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
new file mode 100644
index 00000000..f047a5c9
--- /dev/null
+++ b/.github/workflows/compile.yml
@@ -0,0 +1,145 @@
+name: Build and distribute
+
+on:
+  push:
+    branches:
+      - pre_main_qa
+
+jobs:
+  build-apk:
+    name: Build-apk
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code with submodules
+        uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
+
+
+      - name: Set Version Code
+        run: |
+          echo "Received Number: ${{ github.run_number }}"
+          echo "VERSION_CODE=${{ github.run_number }}" >> $GITHUB_ENV
+          echo "Set VERSION_CODE to: ${{ github.run_number }}"
+        shell: bash
+
+      - uses: sheenhx/action-flutter-build-android@v3
+        with:
+          keystore-base64: ${{ secrets.ANDROID_RELEASE_KEY }}
+          keystore-password: "${{ secrets.ANDROID_RELEASE_KEY_PASSWORD }}"
+          build-cmd: flutter build apk --flavor product --release --build-number=${{ env.VERSION_CODE }}
+          working-directory: ./
+
+      - name: Rename APK
+        run: mv build/app/outputs/flutter-apk/app-product-release.apk build/app/outputs/flutter-apk/moonchain.apk
+          
+      - name: Archive APK
+        uses: actions/upload-artifact@v4
+        with:
+          name: release-apk
+          # Try running the build locally with the build command to be sure of this path
+          path: build/app/outputs/flutter-apk/moonchain.apk
+
+      - uses: ryand56/r2-upload-action@latest
+        with:
+          r2-account-id: ${{ secrets.R2_ACCOUNT_ID }}
+          r2-access-key-id: ${{ secrets.R2_ACCESS_KEY_ID }}
+          r2-secret-access-key: ${{ secrets.R2_SECRET_ACCESS_KEY }}
+          r2-bucket: ${{ secrets.R2_BUCKET }}
+          source-dir: build/app/outputs/flutter-apk
+          destination-dir: app
+
+
+  build-macos:
+    name: Build-ios
+    runs-on: macos-latest
+    steps:
+      - name: Checkout code with submodules
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - uses: sheenhx/action-flutter-build-ios@v1
+        with:
+          # always use --export-options-plist=ios/GithubActionsExportOptions.plist
+          build-cmd: flutter build ipa --build-number=$(( 15 + ${{ github.run_number }})) --export-options-plist=ios/GithubActionsExportOptions.plist
+          certificate-base64: ${{ secrets.IOS_BUILD_CERTIFICATE_BASE64 }}
+          certificate-password: ${{ secrets.IOS_BUILD_CERTIFICATE_PASSWORD }}
+          provisioning-profile-base64: ${{ secrets.IOS_MOBILE_PROVISIONING_PROFILE_BASE64 }}
+          keychain-password: ${{ secrets.IOS_GITHUB_KEYCHAIN_PASSWORD }}
+
+      - name: Archive IPA
+        uses: actions/upload-artifact@v4
+        with:
+          name: release-ipa
+          # Try running the build locally with the build command to be sure of this path
+          path: build/ios/ipa/*.ipa
+
+  upload-combined:
+    name: Combine and Upload Builds
+    needs: [build-apk, build-macos]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download Ubuntu artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: release-apk
+          path: combined-builds/android
+
+      - name: Download macOS artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: release-ipa
+          path: combined-builds/iOS
+
+      - name: Upload combined artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: combined-builds
+          path: combined-builds
+
+      - name: Generate
+        id: generate
+        uses: AcmeSoftwareLLC/app-build-number@v1
+        with:
+          timezone: Asia/Kathmandu
+    
+      - name: Display the generated build number
+        run: echo "Build Number > ${{ steps.generate.outputs.build-number }}"
+
+        
+      - uses: ncipollo/release-action@v1
+        with:
+          artifacts: "combined-builds/android/*.apk,combined-builds/iOS/*.ipa"
+          token: ${{ secrets.DART_TOKEN }}
+          tag: ${{ steps.generate.outputs.build-number }}
+
+          
+      - name: Upload APK to Waldo
+        uses: waldoapp/gh-action-upload@v2
+        with:
+          build_path: combined-builds/android/moonchain.apk
+          upload_token: ${{ secrets.WALDO_SESSIONS_ANDROID }}
+
+  build-waldo:
+    name: Build-waldo
+    runs-on: macos-latest
+    steps:
+      - name: Checkout code with submodules
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - uses: sheenhx/action-flutter-build-ios@v1
+        with:
+          # always use --export-options-plist=ios/GithubActionsExportOptions.plist
+          build-cmd: flutter build ios --simulator
+          certificate-base64: ${{ secrets.IOS_BUILD_CERTIFICATE_BASE64 }}
+          certificate-password: ${{ secrets.IOS_BUILD_CERTIFICATE_PASSWORD }}
+          provisioning-profile-base64: ${{ secrets.IOS_MOBILE_PROVISIONING_PROFILE_BASE64 }}
+          keychain-password: ${{ secrets.IOS_GITHUB_KEYCHAIN_PASSWORD }}
+      - name: Upload IPA to Waldo
+        uses: waldoapp/gh-action-upload@v2
+        with:
+          build_path: build/ios/iphonesimulator/Runner.app
+          upload_token: ${{ secrets.WALDO_SESSIONS_IOS }}
diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml
deleted file mode 100644
index c49dbed0..00000000
--- a/.github/workflows/test-action.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: GPTReviewWorkflow
-
-on:
-  pull_request:
-    types:
-      - opened
-      - synchronize
-
-jobs:
-  review_with_gpt:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: GPTReviewWorkflow
-        uses: sheenhx/GPT4ReviewWorkflow@chunk
-        with:
-          GIT_COMMIT_HASH: ${{ github.event.pull_request.head.sha }}
-          GIT_PATCH_OUTPUT: ${{ github.event.pull_request.patch_url }}
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
-          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-          OPENAI_ORG_KEY: ${{ secrets.OPENAI_ORG_KEY }}
-          PR_NUMBER: ${{ github.event.pull_request.number }}
-          PR_TITLE: ${{ github.event.pull_request.title }}
-          REPOSITORY_NAME: ${{ github.repository }}
diff --git a/.github/workflows/translate.yml b/.github/workflows/translate.yml
index c778cee3..022e1a36 100644
--- a/.github/workflows/translate.yml
+++ b/.github/workflows/translate.yml
@@ -1,24 +1,46 @@
-name: Translate
+name: Translate en.json to de.json
 
 on:
   push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
+    branches:
+      - pre_main_qa
+    paths:
+      - 'assets/flutter_i18n/en.json'
+  workflow_dispatch:
 
 jobs:
   translate:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
 
     steps:
-      - name: translate
-        uses: sheenhx/translatei18n
-        with:
-          GIT_COMMIT_HASH: ${{ github.event.pull_request.head.sha }}
-          GIT_PATCH_OUTPUT: ${{ github.event.pull_request.patch_url }}
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
-          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-          OPENAI_ORG_KEY: ${{ secrets.OPENAI_ORG_KEY }}
-          PR_NUMBER: ${{ github.event.pull_request.number }}
-          PR_TITLE: ${{ github.event.pull_request.title }}
-          REPOSITORY_NAME: ${{ github.repository }}
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.12.3' # Specify Python version
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -q -U google-generativeai
+
+    - name: Run translation script
+      working-directory: translations
+      env:
+        GEMINI_API_KEY: ${{ secrets.GEMINIKEY }}
+      run: |
+        python translate.py
+
+    - name: Commit changes
+      run: |
+        git config --local user.email "action@github.com"
+        git config --local user.name "GitHub Action"
+        git add .
+        git commit -m "Update pre-QA with latest translations"
+        git push
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/README.md b/README.md
index 344ea755..d6faaa5f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# AXS Wallet
+# Moonchain Wallet
 
-AXS wallet using an ERC-20 smart contract.
+Self custodial Moonchain wallet, Seamless interaction with MXC chains & EVM based chains, Enabling users to Send/Receive tokens, NFTs, and interact with Web3 DApps.
 
 ## Project Structure
 
@@ -30,7 +30,7 @@ And also, UseCases are feature-level, while presenters are widget-level. So 1 pr
 
 ## Shared Library
 
-This library includes AXS wallet's UI(User Interface) and business logic. The basic components and images, fonts, colors come from defination of designer's Figma. The logic part is to call the related APIs.
+This library includes Moonchain wallet's UI(User Interface) and business logic. The basic components and images, fonts, colors come from defination of designer's Figma. The logic part is to call the related APIs.
 
 The repository: https://github.com/MXCzkEVM/mxc-shared-flutter
 
@@ -75,7 +75,7 @@ When you want to debug on your local computer, suggest to create .vscode/launch.
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "axs-wallet",
+            "name": "moonchain-wallet",
             "request": "launch",
             "type": "dart",
             "args": [
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 04754268..a2c29632 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -5,6 +5,12 @@ if (localPropertiesFile.exists()) {
         localProperties.load(reader)
     }
 }
+// Load key.properties
+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file("key.properties")
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+}
 
 def flutterRoot = localProperties.getProperty('flutter.sdk')
 if (flutterRoot == null) {
@@ -23,7 +29,7 @@ if (flutterVersionName == null) {
 
 apply plugin: 'com.android.application'
 // START: FlutterFire Configuration
-apply plugin: 'com.google.gms.google-services'
+// apply plugin: 'com.google.gms.google-services'
 // END: FlutterFire Configuration
 apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
@@ -50,31 +56,34 @@ android {
     }
 
     defaultConfig {
-        applicationId "com.mxc.axswallet"
+        applicationId "com.mxc.moonchainWallet"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode System.getenv('APPCENTER_BUILD_ID')?.toInteger() ?: 404
+        versionCode System.getenv('VERSION_CODE')?.hashCode()?.abs() ?: 404
         versionName flutterVersionName
     }
 
     signingConfigs {
         release {
-            storeFile rootProject.file("app/key.jks")
-            storePassword System.getenv("APPCENTER_KEYSTORE_PASSWORD")
-            keyAlias System.getenv("APPCENTER_KEY_ALIAS")
-            keyPassword System.getenv("APPCENTER_KEY_PASSWORD")
+            keyAlias = keystoreProperties['keyAlias']
+            keyPassword = keystoreProperties['keyPassword']
+            storeFile = keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+            storePassword = keystoreProperties['storePassword']
         }
       
     }
 
      buildTypes {
         release {
-            signingConfig signingConfigs.release
+            // Enables code shrinking, obfuscation, and optimization
             minifyEnabled true
+            // Enables resource shrinking
             shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            // Specify ProGuard rules files
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.release
         }
         debug {
             signingConfig signingConfigs.debug
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index 30e32fa0..35da0ec0 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mxc.axswallet">
+    package="com.mxc.moonchainWallet">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index f0ae7ec7..7279f474 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" package="com.mxc.axswallet">
+    xmlns:tools="http://schemas.android.com/tools" package="com.mxc.moonchainWallet">
 
     <queries>
         <package android:name="org.telegram.messenger" />
@@ -44,12 +44,12 @@
 
     <uses-feature android:name="android.hardware.bluetooth_le" android:required="false" />
 
-    <application tools:replace="android:label" android:label="AXS" android:name="${applicationName}" android:icon="@mipmap/ic_launcher" android:theme="@style/LaunchTheme" android:requestLegacyExternalStorage="true">
+    <application tools:replace="android:label" android:label="MoonBase" android:name="${applicationName}" android:icon="@mipmap/ic_launcher" android:theme="@style/LaunchTheme" android:requestLegacyExternalStorage="true">
 
 
-        <meta-data android:name="com.google.firebase.messaging.default_notification_channel_id" android:value="axs_wallet_channel" />
+        <meta-data android:name="com.google.firebase.messaging.default_notification_channel_id" android:value="moonchain_wallet_channel" />
 
-        <meta-data android:name="com.google.firebase.messaging.default_notification_icon" android:resource="@drawable/axs_logo" />
+        <meta-data android:name="com.google.firebase.messaging.default_notification_icon" android:resource="@drawable/moonchain_logo" />
 
         <meta-data android:name="com.google.firebase.messaging.default_notification_color" android:resource="@color/primary" />
 
diff --git a/android/app/src/main/kotlin/com/example/datadashwallet/MainActivity.kt b/android/app/src/main/kotlin/com/example/datadashwallet/MainActivity.kt
index e58a4168..1ccc4bbd 100644
--- a/android/app/src/main/kotlin/com/example/datadashwallet/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/example/datadashwallet/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.mxc.axswallet
+package com.mxc.moonchainWallet
 
 import io.flutter.embedding.android.FlutterFragmentActivity
 
diff --git a/android/app/src/main/res/drawable/moonchain_logo.png b/android/app/src/main/res/drawable/moonchain_logo.png
new file mode 100644
index 00000000..89ad4e87
Binary files /dev/null and b/android/app/src/main/res/drawable/moonchain_logo.png differ
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
old mode 100644
new mode 100755
index 4ae7d123..345888d2
--- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+  <background android:drawable="@mipmap/ic_launcher_background"/>
+  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+  <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index 4ae7d123..00000000
--- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100755
index 00000000..caf964a1
Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index 5c04ca8f..00000000
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png
new file mode 100755
index 00000000..0d3dd971
Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.webp
deleted file mode 100644
index 37396ddc..00000000
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100755
index 00000000..3ca00aed
Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
deleted file mode 100644
index 963be2bd..00000000
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png
new file mode 100755
index 00000000..3ca00aed
Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index 166daff4..00000000
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100755
index 00000000..22dbbea0
Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index d2629535..00000000
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png
new file mode 100755
index 00000000..2f38939a
Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.webp b/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.webp
deleted file mode 100644
index 83a7142f..00000000
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100755
index 00000000..a6c56f54
Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
deleted file mode 100644
index b35029f5..00000000
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png
new file mode 100755
index 00000000..a6c56f54
Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index fb0784ad..00000000
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100755
index 00000000..86996e0f
Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index e982d5b8..00000000
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
new file mode 100755
index 00000000..f57d143b
Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.webp
deleted file mode 100644
index 337a6867..00000000
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100755
index 00000000..ed20d389
Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
deleted file mode 100644
index 426258b8..00000000
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png
new file mode 100755
index 00000000..ed20d389
Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index a62fcd8c..00000000
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100755
index 00000000..5608b686
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
deleted file mode 100644
index f4d4df31..00000000
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
new file mode 100755
index 00000000..98ad8805
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.webp b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.webp
deleted file mode 100644
index 87a0befc..00000000
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100755
index 00000000..bfe191c1
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
deleted file mode 100644
index 2cf8367b..00000000
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png
new file mode 100755
index 00000000..bfe191c1
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
deleted file mode 100644
index b7c045f9..00000000
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100755
index 00000000..e7673fa2
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
deleted file mode 100644
index e37e650c..00000000
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
new file mode 100755
index 00000000..a6a6f210
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.webp b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.webp
deleted file mode 100644
index 31c2f2e8..00000000
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100755
index 00000000..5cec1b7e
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
deleted file mode 100644
index e31d4f61..00000000
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png
new file mode 100755
index 00000000..5cec1b7e
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
deleted file mode 100644
index e79a4416..00000000
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
index 3f2fee9a..6738462d 100644
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="primary">#5077F7</color>
+    <color name="primary">#000000</color>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
index 30e32fa0..35da0ec0 100644
--- a/android/app/src/profile/AndroidManifest.xml
+++ b/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mxc.axswallet">
+    package="com.mxc.moonchainWallet">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/android/build.gradle b/android/build.gradle
index 0dfdce2c..227acdbc 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:7.2.0'
         // START: FlutterFire Configuration
-        classpath 'com.google.gms:google-services:4.3.10'
+        // classpath 'com.google.gms:google-services:4.3.10'
         // END: FlutterFire Configuration
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
diff --git a/assets/flutter_i18n/de.json b/assets/flutter_i18n/de.json
index c01a8577..efbb094a 100644
--- a/assets/flutter_i18n/de.json
+++ b/assets/flutter_i18n/de.json
@@ -10,11 +10,11 @@
     "confirm_passcode_desc": "Geben Sie Ihren Passcode erneut ein",
     "secret_recovery_phrase": "Geheimer Wiederherstellungsphrase",
     "import_your_wallet": "Importieren Sie Ihre Wallet",
-    "word_seed_phrase": "Importieren Sie einfach Ihre bestehende Wallet mit Ihrem 12-, 18- oder 24-Wörter-Wiederherstellungsphrase, oder laden Sie die AXS Wallet Schlüssel Textdatei aus der E-Mail herunter und fügen Sie die Wiederherstellungsphrase hier ein.",
+    "word_seed_phrase": "Importieren Sie einfach Ihre bestehende Wallet mit Ihrem 12-, 18- oder 24-Wörter-Wiederherstellungsphrase, oder laden Sie die Moonchain Wallet Schlüssel Textdatei aus der E-Mail herunter und fügen Sie die Wiederherstellungsphrase hier ein.",
     "confirm": "Bestätigen",
     "choose_my_username": "Wähle meinen Benutzernamen",
     "mnemonic_passphrase": "Mnemonischer Passphrase",
-    "biometrics_setup": "AXS Biometrie-Einrichtung",
+    "biometrics_setup": "Moonchain Biometrie-Einrichtung",
     "mxc_zkevm_username": "MXC zkEVM Benutzername",
     "ens_announcement_description": "Mit Ihrem einzigartigen MXC zkEVM-Benutzernamen gehört der umständliche Umgang mit komplexen Wallet-Adressen der Vergangenheit an. Jetzt können Sie mühelos einen personalisierten und exklusiven Namen verwenden, der Sie abhebt.",
     "choose_your_username": "Wählen Sie Ihren einzigartigen MXC zkEVM-Benutzernamen",
@@ -41,12 +41,12 @@
     "send": "Senden",
     "received": "Empfangen",
     "sent": "Gesendet",
-    "email_secured_body": "Für die Sicherheit und Privatsphäre Ihrer AXS-Wallet ist es unerlässlich, dass Sie alle Informationen in dieser E-Mail streng vertraulich behandeln. \nBitte folgen Sie diesen nächsten Schritten sorgfältig: \n1. Stellen Sie sicher, dass Sie der einzige Empfänger dieser E-Mail sind, indem Sie die Empfängeradresse durch Ihre eigene ersetzen. \n2. Nach Bestätigung der korrekten E-Mail-Adresse klicken Sie auf die Schaltfläche 'Senden', um diese wichtigen Informationen sicher an sich selbst weiterzuleiten. Durch die Einhaltung dieser Maßnahmen gewährleisten Sie die höchste Sicherheit für Ihre AXS-Wallet. Vielen Dank für Ihre Sorgfalt in dieser Angelegenheit.",
-    "email_secured_subject": "Sichern Sie Ihren AXS Wallet Schlüssel - Wichtige Anweisungen",
+    "email_secured_body": "Für die Sicherheit und Privatsphäre Ihrer Moonchain-Wallet ist es unerlässlich, dass Sie alle Informationen in dieser E-Mail streng vertraulich behandeln. \nBitte folgen Sie diesen nächsten Schritten sorgfältig: \n1. Stellen Sie sicher, dass Sie der einzige Empfänger dieser E-Mail sind, indem Sie die Empfängeradresse durch Ihre eigene ersetzen. \n2. Nach Bestätigung der korrekten E-Mail-Adresse klicken Sie auf die Schaltfläche 'Senden', um diese wichtigen Informationen sicher an sich selbst weiterzuleiten. Durch die Einhaltung dieser Maßnahmen gewährleisten Sie die höchste Sicherheit für Ihre Moonchain-Wallet. Vielen Dank für Ihre Sorgfalt in dieser Angelegenheit.",
+    "email_secured_subject": "Sichern Sie Ihren Moonchain Wallet Schlüssel - Wichtige Anweisungen",
     "face_id": "Gesichts ID",
     "fingerprint": "Fingerabdruck",
     "touch_id": "Touch ID",
-    "unlock_axs_wallet": "Entsperren Sie Ihre AXS-Wallet",
+    "unlock_moonchain_wallet": "Entsperren Sie Ihre Moonchain-Wallet",
     "enter_your_passcode": "Geben Sie Ihren Passcode ein",
     "attempts_x": "{0} von 6 Versuchen",
     "forgot_passcode": "Ich habe meinen Passcode vergessen",
@@ -217,8 +217,8 @@
     "networks": "Netzwerke",
     "added": "Hinzugefügt",
     "want_to_add_this_network": "Möchten Sie dieses Netzwerk hinzufügen?",
-    "network_adding_usage_notice": "Das Hinzufügen dieses Netzwerks ermöglicht die Nutzung innerhalb von AXS.",
-    "custom_network_security_alert": "AXS unterstützt keine benutzerdefinierten Netzwerke oder deren Sicherheit.",
+    "network_adding_usage_notice": "Das Hinzufügen dieses Netzwerks ermöglicht die Nutzung innerhalb von Moonchain.",
+    "custom_network_security_alert": "Moonchain unterstützt keine benutzerdefinierten Netzwerke oder deren Sicherheit.",
     "block_explorer_url": "Block Explorer URL",
     "new_network_added": "Neues Netzwerk hinzugefügt",
     "x_is_now_available": "\"{0}\" ist jetzt im Netzwerkauswähler verfügbar.",
@@ -288,11 +288,11 @@
     "send_&_receive": "Senden & Empfangen",
     "contract": "Vertrag",
     "decimals": "Dezimalstellen",
-    "add_token_success_message": "Hurra! Der Token wurde erfolgreich zu Ihrer AXS-Brieftasche hinzugefügt! 🎉",
+    "add_token_success_message": "Hurra! Der Token wurde erfolgreich zu Ihrer Moonchain-Brieftasche hinzugefügt! 🎉",
     "import_account": "Konto importieren",
     "add_account": "Konto hinzufügen",
     "private_key": "Privater Schlüssel",
-    "import_notice": "Importierte Konten werden nicht mit Ihrem AXS Wallet Secret Recovery Phrase verknüpft sein.",
+    "import_notice": "Importierte Konten werden nicht mit Ihrem Moonchain Wallet Secret Recovery Phrase verknüpft sein.",
     "imported": "Importiert",
     "view_private_key": "Privaten Schlüssel anzeigen",
     "view_private_key_notice": "Warnung: Geben Sie diesen Schlüssel niemals preis. Jeder, der Ihre privaten Schlüssel besitzt, kann alle Vermögenswerte stehlen, die auf Ihrem Konto gehalten werden.",
@@ -302,8 +302,8 @@
     "duplicate_account_import_notice": "Das Konto, das Sie versuchen zu importieren, ist ein Duplikat.",
     "unable_to_launch_email_app": "Nicht in der Lage, E-Mail-App zu starten",
     "max_fee": "Maximale Gebühr",
-    "deposit_from_exchanges_notice": "Kaufen Sie von {0}, {1} Börsen und hinterlegen Sie zkEVM MXC direkt in die AXS Wallet.",
-    "deposit_with_l3_bridge_notice": "Kaufen Sie von anderen Börsen und verwenden Sie {0}, um ERC20 MXC in die AXS Wallet einzuzahlen.",
+    "deposit_from_exchanges_notice": "Kaufen Sie von {0}, {1} Börsen und hinterlegen Sie zkEVM MXC direkt in die Moonchain Wallet.",
+    "deposit_with_l3_bridge_notice": "Kaufen Sie von anderen Börsen und verwenden Sie {0}, um ERC20 MXC in die Moonchain Wallet einzuzahlen.",
     "buy_some_x_for_fee_notice": "Kaufen Sie etwas {0}, um die Gasgebühr für die Transaktion zu bezahlen, normalerweise weniger als 2 USD, wenn das Netzwerk nicht ausgelastet ist.",
     "insufficient_funds_notice": "Unzureichendes Guthaben für diese Transaktion. Bitte fügen Sie Geldmittel hinzu.",
     "contractCall": "Vertragsaufruf",
@@ -322,8 +322,8 @@
     "gas_fee_replacement_notice": "Diese Gasgebühr wird das Original ersetzen.",
     "unknown": "Unbekannt",
     "transaction_finalized": "Transaktion abgeschlossen",
-    "background_fetch_notice_title": "Optimieren Sie Ihr AXS Wallet Erlebnis",
-    "background_fetch_notice_text": "Um die Spitzenleistung der AXS Wallet zu gewährleisten, empfehlen wir, die App im Hintergrund aktiv zu halten und sie von den Einstellungen zur Batterieoptimierung auszuschließen. Dies hilft, eine nahtlose Funktionalität und einen unterbrechungsfreien Zugang zu Ihrer Wallet aufrechtzuerhalten.",
+    "background_fetch_notice_title": "Optimieren Sie Ihr Moonchain Wallet Erlebnis",
+    "background_fetch_notice_text": "Um die Spitzenleistung der Moonchain Wallet zu gewährleisten, empfehlen wir, die App im Hintergrund aktiv zu halten und sie von den Einstellungen zur Batterieoptimierung auszuschließen. Dies hilft, eine nahtlose Funktionalität und einen unterbrechungsfreien Zugang zu Ihrer Wallet aufrechtzuerhalten.",
     "acknowledge": "Bestätigen",
     "background_notifications_service_launched_successfully": "Hintergrundbenachrichtigungsdienst erfolgreich gestartet.",
     "unable_to_launch_background_notification_service": "Start des Hintergrundbenachrichtigungsdienstes nicht möglich.",
@@ -351,7 +351,7 @@
     "auto_claim_execution_dialog_text": "Die Zeit für die automatische Forderung ist abgelaufen. Möchten Sie die automatische Forderung jetzt ausführen?",
     "execute": "Ausführen",
     "auto_claim_scheduling_text": "Die Auto-Anspruchsfunktion wird morgen um {0} ausgeführt.",
-    "wifi_location_background_fetch_notice_text": "Um die Spitzenleistung der AXS Wallet zu gewährleisten, empfehlen wir, die App im Hintergrund aktiv zu halten und sie von den Einstellungen zur Batterieoptimierung auszuschließen. Dies hilft, eine nahtlose Funktionalität und einen ununterbrochenen Zugang zu Ihrer Wallet aufrechtzuerhalten. Bitte beachten Sie, dass nur WiFi-Hexagon-Ortungshaken im Hintergrund Ortungsdienste nutzen werden; andere Dienste innerhalb der App werden Ihren Standort nicht abrufen, während die App im Hintergrund läuft.",
+    "wifi_location_background_fetch_notice_text": "Um die Spitzenleistung der Moonchain Wallet zu gewährleisten, empfehlen wir, die App im Hintergrund aktiv zu halten und sie von den Einstellungen zur Batterieoptimierung auszuschließen. Dies hilft, eine nahtlose Funktionalität und einen ununterbrochenen Zugang zu Ihrer Wallet aufrechtzuerhalten. Bitte beachten Sie, dass nur WiFi-Hexagon-Ortungshaken im Hintergrund Ortungsdienste nutzen werden; andere Dienste innerhalb der App werden Ihren Standort nicht abrufen, während die App im Hintergrund läuft.",
     "wifi_hexagon_location_hooks": "Wi-Fi Hexagon Standort Haken",
     "mxc_top_up_notification_text": "Hallo {0}! Sie haben heute {1} MXC zu Ihrer Wallet hinzugefügt. Lassen Sie es weiter wachsen!",
     "mxc_top_up_notification_title": "Glückwunsch zum neuen Aufladen",
@@ -379,16 +379,16 @@
     "wifi_info_notifications_title": "Erfolgreiches Wi-Fi Transaktions-Update",
     "wifi_info_notifications_text": "Sie haben erfolgreich die Liste der Wi-Fi-Netzwerke aktualisiert, indem Sie eine Transaktion an das MXC zkEVM gesendet haben.",
     "wifi_info_tx_failed": "Hoppla, Wi-Fi Transaktionsupdate fehlgeschlagen!",
-    "axs_background_location_service_text": "Der Standortdienst für Wi-Fi-Hooks der AXS-Wallet läuft im Hintergrund... .",
-    "axs_background_location_service_title": "AXS Wallet Standortdienst",
+    "moonchain_background_location_service_text": "Der Standortdienst für Wi-Fi-Hooks der Moonchain-Wallet läuft im Hintergrund... .",
+    "moonchain_background_location_service_title": "Moonchain Wallet Standortdienst",
     "unable_to_retrieve_wifi_info_successfully": "WLAN-Informationen konnten nicht erfolgreich abgerufen werden!",
     "auto_claim_started": "Auto Claim gestartet 🏁",
     "no_miners_selected_notification_title": "Sieht so aus, als hätten Sie keine Miner ausgewählt. ℹ️",
     "no_miners_selected_notification_text": "Bitte gehen Sie zur Miner DApp, um Miner auszuwählen.",
     "auto_claim_successful_notification_title": "Miner Auto-Anspruch erfolgreich ✅",
-    "auto_claim_successful_notification_text": "Die AXS-Wallet wurde erfolgreich beansprucht, Sie haben Tokens abgebaut.",
+    "auto_claim_successful_notification_text": "Die Moonchain-Wallet wurde erfolgreich beansprucht, Sie haben Tokens abgebaut.",
     "nothing_to_claim_notification_title": "Hoppla, Nichts zum Beanspruchen ℹ️",
-    "nothing_to_claim_notification_text": "Die AXS-Wallet hat versucht, Ihre abgebauten Tokens zu beanspruchen, konnte jedoch keine Tokens zum Beanspruchen finden.",
+    "nothing_to_claim_notification_text": "Die Moonchain-Wallet hat versucht, Ihre abgebauten Tokens zu beanspruchen, konnte jedoch keine Tokens zum Beanspruchen finden.",
     "auto_claim_failed": "Miner Auto-Anspruch fehlgeschlagen ❌",
     "no_miners_owned_notification": "Sieht so aus, als ob diese Wallet keine Miner besitzt. ℹ️",
     "mining_tokens_from_miner": "Tokens abbauen von Miner #{0}. ⛏️",
@@ -396,9 +396,9 @@
     "tokens_mined_successfully_miner": "Bergmann #{0}: Tokens erfolgreich abgebaut. ✅",
     "token_mining_failed": "Bergarbeiter #{0}: Token-Mining-Prozess fehlgeschlagen. ❌",
     "merkle_proof_error": "Fehler beim Versuch, den Merkle-Nachweis zu überprüfen.",
-    "axs_location_permission_use_case": "Die AXS Wallet benötigt Zugriff auf Ihren Standort für Funktionen wie Wi-Fi-Hooks, während die App in Gebrauch ist oder im Hintergrund läuft. Ihre Standortdaten werden nicht gespeichert oder mit Dritten geteilt.",
-    "axs_camera_permission_use_case": "Die AXS Wallet benötigt Zugriff auf Ihre Kamera, wenn die App für Dienste wie RWA-Minting in Gebrauch ist. Bilddaten werden nicht gespeichert oder mit Dritten geteilt.",
-    "axs_photos_permission_use_case": "Die AXS Wallet benötigt Zugriff auf Ihre Fotos, um Bilder wie RWA zu speichern. Ihre Fotos werden nicht gespeichert oder mit Dritten geteilt.",
+    "moonchain_location_permission_use_case": "Die Moonchain Wallet benötigt Zugriff auf Ihren Standort für Funktionen wie Wi-Fi-Hooks, während die App in Gebrauch ist oder im Hintergrund läuft. Ihre Standortdaten werden nicht gespeichert oder mit Dritten geteilt.",
+    "moonchain_camera_permission_use_case": "Die Moonchain Wallet benötigt Zugriff auf Ihre Kamera, wenn die App für Dienste wie RWA-Minting in Gebrauch ist. Bilddaten werden nicht gespeichert oder mit Dritten geteilt.",
+    "moonchain_photos_permission_use_case": "Die Moonchain Wallet benötigt Zugriff auf Ihre Fotos, um Bilder wie RWA zu speichern. Ihre Fotos werden nicht gespeichert oder mit Dritten geteilt.",
     "permission_use_cases": "Nutzungsfälle für Berechtigungen",
     "ok_allow": "OK, Erlauben",
     "not_now": "Nicht jetzt",
@@ -416,7 +416,7 @@
     "local_secured_storage": "Lokaler gesicherter Speicher",
     "save_locally": "Lokal speichern",
     "save_locally_description": "Stellen Sie sicher, dass Sie Ihre Schlüssel lokal speichern und dann können Sie loslegen.",
-    "axs_storage_permission_use_case": "Die AXS Wallet benötigt Zugriff auf Ihren Speicher für Funktionen wie RWA. Ihre Speicherdaten werden nicht gespeichert oder mit Dritten geteilt.",
+    "moonchain_storage_permission_use_case": "Die Moonchain Wallet benötigt Zugriff auf Ihren Speicher für Funktionen wie RWA. Ihre Speicherdaten werden nicht gespeichert oder mit Dritten geteilt.",
     "local_backup": "Lokale Sicherung",
     "no_description": "Keine Beschreibung",
     "bluetooth_not_supported": "Bluetooth wird auf diesem Gerät nicht unterstützt.",
@@ -443,9 +443,9 @@
     "no_rings_selected_notification_title": "Sieht so aus, als hätten Sie keine Blueberry Rings ausgewählt. ℹ️",
     "no_rings_selected_notification_text": "Bitte gehen Sie zur Blueberry Ring DApp, um Ringe auszuwählen.",
     "auto_sync_successful_notification_title": "Erfolgreiche Auto-Claim von Blueberry Ring ✅",
-    "auto_sync_successful_notification_text": "Ihre Ringdaten wurden erfolgreich mit der AXS-Wallet synchronisiert.",
+    "auto_sync_successful_notification_text": "Ihre Ringdaten wurden erfolgreich mit der Moonchain-Wallet synchronisiert.",
     "already_synced_notification_title": "Hoppla, bereits synchronisiert ℹ️",
-    "already_synced_notification_text": "Die AXS-Wallet hat versucht, Ihre Ringdaten zu synchronisieren, aber es sieht so aus, als hätten Sie die Ringdaten heute bereits synchronisiert.",
+    "already_synced_notification_text": "Die Moonchain-Wallet hat versucht, Ihre Ringdaten zu synchronisieren, aber es sieht so aus, als hätten Sie die Ringdaten heute bereits synchronisiert.",
     "auto_sync_failed": "Blueberry Ring Auto-Sync fehlgeschlagen ❌",
     "no_rings_owned_notification": "Sieht so aus, als ob diese Wallet keine Blueberry Rings besitzt. ℹ️",
     "syncing_data_from_ring": "Synchronisieren von Daten aus dem Blueberry Ring #{0}. ⛏️",
@@ -453,5 +453,23 @@
     "data_synced_successfully_ring": "Blaubeere Ring #{0}: Daten erfolgreich synchronisiert. ✅",
     "data_syncing_failed": "Blaubeere Ring #{0}: Daten-Synchronisationsprozess fehlgeschlagen. ❌",
     "blueberry_hooks": "Blaubeerhaken",
-    "message": "Nachricht"
+    "message": "Nachricht",
+    "moonchain_username": "Mondkette-Benutzername",
+    "powered_by_moonchain_supernodes": "Powered by {Moonchain Supernodes}",
+    "moonchain_design_documents": "Mondkette-Designdokumente",
+    "continue_now": "Weitermachen",
+    "you_will_be_directed_to_the_main_app": "Sie werden zur Haupt-App weitergeleitet",
+    "account_setup_complete": "Kontoeinrichtung abgeschlossen!",
+    "entering_the_app": "Die App betreten",
+    "in": "Wird geladen..",
+    "google_drive_secured_storage": "Sicherer Speicher von Google Drive",
+    "icloud_secured_storage": "iCloud-geschützter Speicher",
+    "make_sure_you_have_stored_your_keys_correctly_in_your_x": "Stellen Sie sicher, dass Sie Ihre Schlüssel korrekt in Ihrem {0} gespeichert haben",
+    "icloud": "iCloud",
+    "google_drive": "Google Drive",
+    "store_in_x": "Speichern in {0}",
+    "your_email_address": "Ihre E-Mail-Adresse",
+    "invalid_email": "Bitte geben Sie eine gültige E-Mail-Adresse ein (z. B. name@example.com)",
+    "email": "E-Mail",
+    "hello": "Hallo"
 }
\ No newline at end of file
diff --git a/assets/flutter_i18n/en.json b/assets/flutter_i18n/en.json
index 4a862b33..2485c51c 100644
--- a/assets/flutter_i18n/en.json
+++ b/assets/flutter_i18n/en.json
@@ -10,20 +10,20 @@
 	"set_passcode_hint": "Enter a 6-digit passcode to unlock your wallet with ease. This passcode can’t be used to recover your wallet.",
 	"passcode_didnt_match": "Passcodes did not match. Try again.",
 	"confirm_passcode_desc": "Re-type your passcode",
-	"secret_recovery_phrase": "Secret recovery phrase",
+	"secret_recovery_phrase": "Secret Recovery Phrase",
 	"import_your_wallet": "Import Your Wallet",
-	"word_seed_phrase": "Simply import your existing wallet with your 12, 18 or 24-word recovery phrase, or download from the email AXS wallet key text file and paste the recovery phrase here",
+	"word_seed_phrase": "Simply import your existing wallet with your 12, 18 or 24-word recovery phrase, or download from the email Moonchain wallet key text file and paste the recovery phrase here",
 	"confirm": "Confirm",
 	"choose_my_username": "Choose my username",
 	"mnemonic_passphrase": "Mnemonic Passphrase",
 	"biometrics": "biometrics",
-	"biometrics_setup": "AXS Biometrics Setup",
-	"mxc_zkevm_username": "MXC zkEVM Username",
-	"ens_announcement_description": "With your unique MXC zkEVM username, the cumbersome process of handling complex wallet addresses becomes a thing of the past. Now, you can effortlessly employ a customised and exclusive name that sets you apart.",
-	"choose_your_username": "Choose your unique MXC zkEVM username",
-	"ens_register_description": "MXC domain names, rare gems in the hexagon, NFT, and IoT universe, are your ticket to a memorable digital identity. Choose wisely!",
+	"biometrics_setup": "Moonchain Wallet Biometrics Setup",
+	"moonchain_username": "Moonchain Username",
+	"ens_announcement_description": "With your unique Moonchain username, the cumbersome process of handling complex wallet addresses becomes a thing of the past. Now, you can effortlessly employ a customised and exclusive name that sets you apart.",
+	"choose_your_username": "Choose your unique Moonchain username",
+	"ens_register_description": "Moonchain domain names, rare gems in the hexagon, NFT, and IoT universe, are your ticket to a memorable digital identity. Choose wisely!",
 	"username": "Username",
-	"prowerd_zkevm": "Powered by MXC zkEVM Supernodes",
+	"powered_by_moonchain_supernodes": "Powered by Moonchain Supernodes",
 	"claim_my_username": "Claim my username",
 	"congratulations": "Congratulations",
 	"successfully_claimed": "You have successfully claimed your username!",
@@ -45,12 +45,12 @@
 	"received": "Received",
 	"sent": "Sent",
 	"contractCall": "Contract call",
-	"email_secured_body": "For the security and privacy of your AXS wallet it's essential that you keep all information contained in this email strictly confidential. \nPlease follow these next steps carefully: \n1. Ensure you're the sole recipient of this email by replacing the recipient's address with your own. \n2. After confirming the correct email address, proceed to click the 'Send' button to forward this vital information to yourself securely. By adhering to these measures, you'll ensure the utmost safety for your AXS wallet. Thank you for your diligence in this matter.",
-	"email_secured_subject": "Secure Your AXS Wallet Key - Important Instructions",
+	"email_secured_body": "For the security and privacy of your Moonchain wallet it's essential that you keep all information contained in this email strictly confidential. \nPlease follow these next steps carefully: \n1. Ensure you're the sole recipient of this email by replacing the recipient's address with your own. \n2. After confirming the correct email address, proceed to click the 'Send' button to forward this vital information to yourself securely. By adhering to these measures, you'll ensure the utmost safety for your Moonchain wallet. Thank you for your diligence in this matter.",
+	"email_secured_subject": "Secure Your Moonchain Wallet Key - Important Instructions",
 	"face_id": "Face ID",
 	"fingerprint": "Fingerprint",
 	"touch_id": "Touch ID",
-	"unlock_axs_wallet": "Unlock your AXS wallet",
+	"unlock_moonchain_wallet": "Unlock your Moonchain wallet",
 	"enter_your_passcode": "Enter your passcode",
 	"attempts_x": "{0} out of 6 attempts",
 	"forgot_passcode": "I forgot my passcode",
@@ -94,7 +94,7 @@
 	"enter_secret_recovery_phrase": "Enter your secret recovery phrase",
 	"log_out": "Log out",
 	"to_reset_passcode": "To reset your passcode",
-	"create_new_wallet": "Create a new wallet or import an existing one.",
+	"create_new_wallet": "Import an existing one.",
 	"automatically_log_out": "After 6 failed attempts, you’ll be automatically logged out for your security.",
 	"done": "Done",
 	"add_x": "Add {0}",
@@ -197,7 +197,7 @@
 	"default": "Default",
 	"gas_limit": "Gas limit",
 	"x_must_numeric": "{0} Must be numeric",
-	"chain": "chain",
+	"chain": "Chain",
 	"network_name": "Network Name",
 	"rpc_url": "RPC URL",
 	"chain_id": "Chain ID",
@@ -215,7 +215,7 @@
 	"export_wallet_logs": "Export wallet logs",
 	"diagnosing_logs": "To assist others in diagnosing your issue, please download and provide the transaction logs from your wallet. This information can offer valuable insight into the nature of the problem you're encountering.",
 	"export_logs": "Export logs",
-	"contact_chatgpt_support": "Contact MXC-GPT support",
+	"contact_chatgpt_support": "Contact Moon-GPT support",
 	"jump_to_telegram": "Jump to Telegram",
 	"custom_network": "Custom Network",
 	"mainnet": "Mainnet",
@@ -224,8 +224,8 @@
 	"networks": "Networks",
 	"added": "Added",
 	"want_to_add_this_network": "Want to add this network?",
-	"network_adding_usage_notice": "Adding this network, allows it to be used within AXS",
-	"custom_network_security_alert": "AXS does not endorse custom networks or their security.",
+	"network_adding_usage_notice": "Adding this network, allows it to be used within Moonchain wallet",
+	"custom_network_security_alert": "Moonchain wallet does not endorse custom networks or their security.",
 	"block_explorer_url": "Block explorer url",
 	"new_network_added": "New network added",
 	"x_is_now_available": "\"{0}\" is now available in the network selector.",
@@ -294,11 +294,11 @@
 	"send_&_receive": "Send & Receive",
 	"contract": "Contract",
 	"decimals": "Decimals",
-	"add_token_success_message": "Hooray! The token has been successfully added to your AXS wallet! 🎉",
+	"add_token_success_message": "Hooray! The token has been successfully added to your Moonchain wallet! 🎉",
 	"import_account": "Import account",
 	"add_account": "Add account",
 	"private_key": "Private key",
-	"import_notice": "Imported accounts won’t be associated with your AXS wallet Secret Recovery Phrase.",
+	"import_notice": "Imported accounts won’t be associated with your Moonchain wallet Secret Recovery Phrase.",
 	"imported": "Imported",
 	"view_private_key": "View private key",
 	"view_private_key_notice": "Warning: Never disclose this key. Anyone with your private keys can steal any assets held in your account.",
@@ -307,14 +307,14 @@
 	"remove": "Remove",
 	"duplicate_account_import_notice": "The account you are trying to import is a duplicate",
 	"unable_to_launch_email_app": "Unable to launch email app",
-	"deposit_from_exchanges_notice": "Buy from {0}, {1}, {2} or {3} exchanges and deposit zkEVM MXC directly to AXS wallet",
-	"deposit_with_l3_bridge_notice": "Buy from other exchanges and use {0} to deposit ERC20 MXC to AXS wallet",
+	"deposit_from_exchanges_notice": "Buy from {0}, {1}, {2}, {3}, {4}, {5} or {6} exchanges and deposit zkEVM MXC directly to Moonchain wallet",
+	"deposit_with_l3_bridge_notice": "Buy from other exchanges and use {0} to deposit ERC20 MXC to Moonchain wallet",
 	"buy_some_x_for_fee_notice": "Buy some {0} to pay for gas fee for the transaction, normally less than 2 USD when the network is not busy",
 	"insufficient_funds_notice": "Insufficient balance for this transaction.\n Please add funds.",
 	"notifications": "Notifications",
-	"mxc_support_form": "MXC Support Form",
-	"mxc_support": "MXC Support",
-	"mxc_design_documents": "MXC zkEVM design documents",
+	"mxc_support_form": "Moonchain Support Form",
+	"mxc_support": "Moonchain Support",
+	"moonchain_design_documents": "Moonchain design documents",
 	"browse_documents": "Browse Documents",
 	"knowledge_hub": "Knowledge Hub",
 	"learn_more": "Learn More",
@@ -325,9 +325,9 @@
 	"gas_fee_replacement_notice": "This gas fee will replace the original",
 	"unknown": "Unknown",
 	"transaction_finalized": "Transaction Finalized",
-	"background_fetch_notice_title": "Optimize Your AXS Wallet Experience",
-	"background_fetch_notice_text": "To ensure peak performance of the AXS Wallet, we recommend keeping the app active in the background and excluding it from battery optimization settings. This helps maintain seamless functionality and uninterrupted access to your wallet.",
-	"wifi_location_background_fetch_notice_text": "To ensure peak performance of the AXS Wallet, we recommend keeping the app active in the background and excluding it from battery optimization settings. This helps maintain seamless functionality and uninterrupted access to your wallet. Please note that only WiFi hexagon location hooks will use location services in the background; other services within the app will not access your location while the app is running in the background.",
+	"background_fetch_notice_title": "Optimize Your Moonchain Wallet Experience",
+	"background_fetch_notice_text": "To ensure peak performance of the Moonchain Wallet, we recommend keeping the app active in the background and excluding it from battery optimization settings. This helps maintain seamless functionality and uninterrupted access to your wallet.",
+	"wifi_location_background_fetch_notice_text": "To ensure peak performance of the Moonchain Wallet, we recommend keeping the app active in the background and excluding it from battery optimization settings. This helps maintain seamless functionality and uninterrupted access to your wallet. Please note that only WiFi hexagon location hooks will use location services in the background; other services within the app will not access your location while the app is running in the background.",
 	"acknowledge": "Acknowledge",
 	"low_balance": "Low balance",
 	"expected_transaction_fee": "Expected transaction fee",
@@ -380,18 +380,18 @@
 	"getting_wifi_list_is_not_supported": "Getting Wi-Fi list is not supported",
 	"wifi_list_is_empty": "Wi-Fi list is empty",
 	"wifi_info_notifications_title": "Successful Wi-Fi Transaction Update",
-	"wifi_info_notifications_text": "You have successfully updated the list of Wi-Fi networks by submitting a transaction to the MXC zkEVM.",
+	"wifi_info_notifications_text": "You have successfully updated the list of Wi-Fi networks by submitting a transaction to the Moonchain.",
 	"wifi_info_tx_failed": "Oops, Wi-Fi Transaction Update failed!",
-	"axs_background_location_service_text": "AXS wallet background location service for Wi-Fi hooks is running... .",
-	"axs_background_location_service_title": "AXS wallet location service",
+	"moonchain_background_location_service_text": "Moonchain wallet background location service for Wi-Fi hooks is running... .",
+	"moonchain_background_location_service_title": "Moonchain wallet location service",
 	"unable_to_retrieve_wifi_info_successfully": "Unable to retrieve wifi info successfully!",
 	"auto_claim_started": "Auto Claim Started 🏁",
 	"no_miners_selected_notification_title": "Looks like you haven't selected any miners. ℹ️",
 	"no_miners_selected_notification_text": "Please head over to miner DApp for selecting miners.",
 	"auto_claim_successful_notification_title": "Miner aut-claim successful ✅",
-	"auto_claim_successful_notification_text": "AXS wallet has been successfully claimed you mined tokens",
+	"auto_claim_successful_notification_text": "Moonchain wallet has been successfully claimed you mined tokens",
 	"nothing_to_claim_notification_title": "Oops, Nothing to claim ℹ️",
-	"nothing_to_claim_notification_text": "AXS wallet tried to claim your mined tokens, But didn't find any tokens to claim.",
+	"nothing_to_claim_notification_text": "Moonchain wallet tried to claim your mined tokens, But didn't find any tokens to claim.",
 	"auto_claim_failed": "Miner aut-claim failed ❌",
 	"no_miners_owned_notification": "Looks like this wallet doesn't own any miners. ℹ️",
 	"mining_tokens_from_miner": "Mining tokens from Miner #{0}. ⛏️",
@@ -399,19 +399,19 @@
 	"tokens_mined_successfully_miner": "Miner #{0}: Tokens mined successfully. ✅",
 	"token_mining_failed": "Miner #{0}: Token mining process failed. ❌",
 	"merkle_proof_error": "Error while trying to verify Merkle proof.",
-	"axs_location_permission_use_case": "AXS Wallet needs access to your location for features such as Wi-Fi hooks while the app is in use or running in the background. Your location data is not saved or shared with any third parties.",
-	"axs_camera_permission_use_case": "AXS Wallet needs access to your camera when the app is in use for services such as RWA minting. Image data is not saved or shared with any third parties.",
-	"axs_photos_permission_use_case": "AXS Wallet needs access to your photos to save images such as RWA. Your photos are not saved or shared with any third parties.",
-	"axs_storage_permission_use_case": "AXS Wallet needs access to your storage for features such as RWA. Your storage data is not saved or shared with any third parties.",
+	"moonchain_location_permission_use_case": "Moonchain Wallet needs access to your location for features such as Wi-Fi hooks while the app is in use or running in the background. Your location data is not saved or shared with any third parties.",
+	"moonchain_camera_permission_use_case": "Moonchain Wallet needs access to your camera when the app is in use for services such as RWA minting. Image data is not saved or shared with any third parties.",
+	"moonchain_photos_permission_use_case": "Moonchain Wallet needs access to your photos to save images such as RWA. Your photos are not saved or shared with any third parties.",
+	"moonchain_storage_permission_use_case": "Moonchain Wallet needs access to your storage for features such as RWA. Your storage data is not saved or shared with any third parties.",
 	"permission_use_cases": "Permission use cases",
 	"ok_allow": "OK, Allow",
 	"not_now": "Not now",
 	"edit_home_screen": "Edit Home Screen",
-	"add_new_dapp": "Add new dApp",
-	"remove_dapp": "Remove dApp",
-	"dapp_removal_dialog_text": "Deleting this dApp will remove it from your Home Screen.",
+	"add_new_dapp": "Add new DApp",
+	"remove_dapp": "Remove DApp",
+	"dapp_removal_dialog_text": "Deleting this DApp will remove it from your Home Screen.",
 	"information": "Information",
-	"ok": "Ok",
+	"ok": "Okay",
 	"local_backup": "Local backup",
 	"no_description": "No description",
 	"bluetooth_not_supported": "Bluetooth is not supported on this device.",
@@ -438,9 +438,9 @@
 	"no_rings_selected_notification_title": "Looks like you haven't selected any Blueberry Rings. ℹ️",
 	"no_rings_selected_notification_text": "Please head over to Blueberry Ring DApp for selecting rings.",
 	"auto_sync_successful_notification_title": "Blueberry Ring aut-claim successful ✅",
-	"auto_sync_successful_notification_text": "AXS wallet has been successfully synced your ring data",
+	"auto_sync_successful_notification_text": "Moonchain wallet has been successfully synced your ring data",
 	"already_synced_notification_title": "Oops, Already synced ℹ️",
-	"already_synced_notification_text": "AXS wallet tried to sync your ring data, But looks like you have synced the ring data today.",
+	"already_synced_notification_text": "Moonchain wallet tried to sync your ring data, But looks like you have synced the ring data today.",
 	"auto_sync_failed": "Blueberry Ring aut-sync failed ❌",
 	"no_rings_owned_notification": "Looks like this wallet doesn't own any Blueberry Rings. ℹ️",
 	"syncing_data_from_ring": "Syncing data from Blueberry Ring #{0}. ⛏️",
@@ -448,5 +448,20 @@
 	"data_synced_successfully_ring": "Blueberry Ring #{0}: Data synced successfully. ✅",
 	"data_syncing_failed": "Blueberry Ring #{0}: Data syncing process failed. ❌",
 	"blueberry_hooks": "Blueberry hooks",
-	"message": "Message"
-}
\ No newline at end of file
+	"message": "Message",
+	"continue_now": "Continue Now",
+	"you_will_be_directed_to_the_main_app": "You will be directed to the main app",
+	"account_setup_complete": "Account Setup Complete!",
+	"entering_the_app": "Entering the App",
+	"in": "Loading..",
+	"google_drive_secured_storage": "Google Drive secured storage",
+	"icloud_secured_storage": "iCloud Secured storage",
+	"make_sure_you_have_stored_your_keys_correctly_in_your_x": "Make sure you have stored your keys correctly in your {0}",
+	"icloud": "iCloud",
+	"google_drive": "Google Drive",
+	"store_in_x": "Store in {0}",
+	"your_email_address": "Your Email Address",
+	"invalid_email": "Please enter a valid email address (e.g., name@example.com)",
+	"email": "Email",
+	"hello": "Hello"
+}
diff --git a/assets/flutter_i18n/es.json b/assets/flutter_i18n/es.json
index 215ffc05..74776c08 100644
--- a/assets/flutter_i18n/es.json
+++ b/assets/flutter_i18n/es.json
@@ -10,11 +10,11 @@
     "confirm_passcode_desc": "Vuelve a escribir tu código de acceso",
     "secret_recovery_phrase": "Frase secreta de recuperación",
     "import_your_wallet": "Importa Tu Cartera",
-    "word_seed_phrase": "Simplemente importa tu billetera existente con tu frase de recuperación de 12, 18 o 24 palabras, o descarga desde el correo electrónico el archivo de texto con la clave de la billetera AXS y pega la frase de recuperación aquí.",
+    "word_seed_phrase": "Simplemente importa tu billetera existente con tu frase de recuperación de 12, 18 o 24 palabras, o descarga desde el correo electrónico el archivo de texto con la clave de la billetera Moonchain y pega la frase de recuperación aquí.",
     "confirm": "Confirmar",
     "choose_my_username": "Elige mi nombre de usuario",
     "mnemonic_passphrase": "Frase de Contraseña Mnemotécnica",
-    "biometrics_setup": "Configuración de Biometría AXS",
+    "biometrics_setup": "Configuración de Biometría Moonchain",
     "mxc_zkevm_username": "Nombre de usuario MXC zkEVM",
     "ens_announcement_description": "Con tu único nombre de usuario MXC zkEVM, el engorroso proceso de manejar direcciones de billetera complejas se convierte en cosa del pasado. Ahora, puedes emplear sin esfuerzo un nombre personalizado y exclusivo que te distingue.",
     "choose_your_username": "Elige tu único nombre de usuario MXC zkEVM",
@@ -41,12 +41,12 @@
     "send": "Envía",
     "received": "Recibido",
     "sent": "Enviado",
-    "email_secured_body": "Para la seguridad y privacidad de tu cartera AXS, es esencial que mantengas toda la información contenida en este correo electrónico estrictamente confidencial.\nPor favor, sigue estos próximos pasos con cuidado:\n1. Asegúrate de ser el único destinatario de este correo electrónico reemplazando la dirección del destinatario con la tuya.\n2. Después de confirmar la dirección de correo electrónico correcta, procede a hacer clic en el botón 'Enviar' para reenviar esta información vital a ti mismo de manera segura. Al adherirte a estas medidas, garantizarás la máxima seguridad para tu cartera AXS. Gracias por tu diligencia en este asunto.",
-    "email_secured_subject": "Asegura Tu Clave de Cartera AXS - Instrucciones Importantes",
+    "email_secured_body": "Para la seguridad y privacidad de tu cartera Moonchain, es esencial que mantengas toda la información contenida en este correo electrónico estrictamente confidencial.\nPor favor, sigue estos próximos pasos con cuidado:\n1. Asegúrate de ser el único destinatario de este correo electrónico reemplazando la dirección del destinatario con la tuya.\n2. Después de confirmar la dirección de correo electrónico correcta, procede a hacer clic en el botón 'Enviar' para reenviar esta información vital a ti mismo de manera segura. Al adherirte a estas medidas, garantizarás la máxima seguridad para tu cartera Moonchain. Gracias por tu diligencia en este asunto.",
+    "email_secured_subject": "Asegura Tu Clave de Cartera Moonchain - Instrucciones Importantes",
     "face_id": "Identificación Facial",
     "fingerprint": "Huella digital",
     "touch_id": "ID táctil",
-    "unlock_axs_wallet": "Desbloquea tu cartera AXS",
+    "unlock_moonchain_wallet": "Desbloquea tu cartera Moonchain",
     "enter_your_passcode": "Ingresa tu código de acceso",
     "attempts_x": "{0} de 6 intentos",
     "forgot_passcode": "Olvidé mi código de acceso",
@@ -217,8 +217,8 @@
     "networks": "Redes",
     "added": "Añadido",
     "want_to_add_this_network": "¿Deseas agregar esta red?",
-    "network_adding_usage_notice": "Agregar esta red, permite que se utilice dentro de AXS",
-    "custom_network_security_alert": "AXS no respalda las redes personalizadas ni su seguridad.",
+    "network_adding_usage_notice": "Agregar esta red, permite que se utilice dentro de Moonchain",
+    "custom_network_security_alert": "Moonchain no respalda las redes personalizadas ni su seguridad.",
     "block_explorer_url": "URL del explorador de bloques",
     "new_network_added": "Nueva red añadida",
     "x_is_now_available": "\"{0}\" ahora está disponible en el selector de red.",
@@ -242,7 +242,7 @@
     "confirm_delete_wallet": "¿Estás seguro de que quieres restablecer tu billetera?",
     "confirm_delete_wallet_note": "Tenga en cuenta que esta acción es irreversible. Una vez que su billetera se reinicie, todos los datos almacenados, incluyendo sus métodos de pago, historial de transacciones y cualquier moneda digital (si corresponde) serán eliminados permanentemente.\n\nSi no ha respaldado su billetera, le recomendamos encarecidamente que lo haga ahora para asegurarse de no perder ninguna información o activos vitales.",
     "understand_delete": "Entiendo, reiniciar",
-    "delete_wallet_warning": "Escribe \"sí\" para restablecer tu billetera actual",
+    "delete_wallet_warning": "Escribe \"yes\" para restablecer tu billetera actual",
     "type_yes": "Escribe \"yes\"",
     "clear_browser_successfully": "Historial y cookies borrados con éxito",
     "exported_logs_successfully": "Registros exportados con éxito",
@@ -288,11 +288,11 @@
     "send_&_receive": "Enviar y Recibir",
     "contract": "Contrato",
     "decimals": "Decimales",
-    "add_token_success_message": "¡Hurra! El token ha sido agregado exitosamente a tu billetera AXS! 🎉",
+    "add_token_success_message": "¡Hurra! El token ha sido agregado exitosamente a tu billetera Moonchain! 🎉",
     "import_account": "Importar cuenta",
     "add_account": "Añadir cuenta",
     "private_key": "Clave privada",
-    "import_notice": "Las cuentas importadas no estarán asociadas con tu Frase de Recuperación Secreta de la billetera AXS.",
+    "import_notice": "Las cuentas importadas no estarán asociadas con tu Frase de Recuperación Secreta de la billetera Moonchain.",
     "imported": "Importado",
     "view_private_key": "Ver clave privada",
     "view_private_key_notice": "Advertencia: Nunca revele esta clave. Cualquiera con sus claves privadas puede robar cualquier activo que se encuentre en su cuenta.",
@@ -302,8 +302,8 @@
     "duplicate_account_import_notice": "La cuenta que intentas importar es un duplicado.",
     "unable_to_launch_email_app": "Incapaz de iniciar la aplicación de correo electrónico",
     "max_fee": "Tarifa Máxima",
-    "deposit_from_exchanges_notice": "Compra desde {0}, {1} intercambios y deposita zkEVM MXC directamente en la cartera AXS",
-    "deposit_with_l3_bridge_notice": "Compra en otros intercambios y usa {0} para depositar ERC20 MXC en la billetera AXS.",
+    "deposit_from_exchanges_notice": "Compra desde {0}, {1} intercambios y deposita zkEVM MXC directamente en la cartera Moonchain",
+    "deposit_with_l3_bridge_notice": "Compra en otros intercambios y usa {0} para depositar ERC20 MXC en la billetera Moonchain.",
     "buy_some_x_for_fee_notice": "Compra algo de {0} para pagar la tarifa de gas para la transacción, normalmente menos de 2 USD cuando la red no está ocupada.",
     "insufficient_funds_notice": "Saldo insuficiente para esta transacción. Por favor, añade fondos.",
     "contractCall": "Llamada de contrato",
@@ -322,8 +322,8 @@
     "gas_fee_replacement_notice": "Esta tarifa de gas reemplazará la original.",
     "unknown": "Desconocido",
     "transaction_finalized": "Transacción Finalizada",
-    "background_fetch_notice_title": "Optimiza Tu Experiencia con la Cartera AXS",
-    "background_fetch_notice_text": "Para garantizar el rendimiento óptimo de la Cartera AXS, recomendamos mantener la aplicación activa en segundo plano y excluirlo de los ajustes de optimización de batería. Esto ayuda a mantener una funcionalidad sin interrupciones y un acceso ininterrumpido a su cartera.",
+    "background_fetch_notice_title": "Optimiza Tu Experiencia con la Cartera Moonchain",
+    "background_fetch_notice_text": "Para garantizar el rendimiento óptimo de la Cartera Moonchain, recomendamos mantener la aplicación activa en segundo plano y excluirlo de los ajustes de optimización de batería. Esto ayuda a mantener una funcionalidad sin interrupciones y un acceso ininterrumpido a su cartera.",
     "acknowledge": "Reconocer",
     "background_notifications_service_launched_successfully": "El servicio de notificaciones en segundo plano se lanzó con éxito.",
     "unable_to_launch_background_notification_service": "No se puede iniciar el servicio de notificación en segundo plano.",
@@ -351,7 +351,7 @@
     "auto_claim_execution_dialog_text": "El tiempo para la reclamación automática ha transcurrido. ¿Le gustaría ejecutar la reclamación automática ahora?",
     "execute": "Ejecutar",
     "auto_claim_scheduling_text": "La auto-reclamación se ejecutará a las {0} mañana",
-    "wifi_location_background_fetch_notice_text": "Para garantizar el rendimiento óptimo de la Cartera AXS, recomendamos mantener la aplicación activa en segundo plano y excluirlo de los ajustes de optimización de batería. Esto ayuda a mantener una funcionalidad sin interrupciones y acceso ininterrumpido a su cartera. Tenga en cuenta que solo los ganchos de ubicación hexagonal WiFi utilizarán los servicios de ubicación en segundo plano; otros servicios dentro de la aplicación no accederán a su ubicación mientras la aplicación se está ejecutando en segundo plano.",
+    "wifi_location_background_fetch_notice_text": "Para garantizar el rendimiento óptimo de la Cartera Moonchain, recomendamos mantener la aplicación activa en segundo plano y excluirlo de los ajustes de optimización de batería. Esto ayuda a mantener una funcionalidad sin interrupciones y acceso ininterrumpido a su cartera. Tenga en cuenta que solo los ganchos de ubicación hexagonal WiFi utilizarán los servicios de ubicación en segundo plano; otros servicios dentro de la aplicación no accederán a su ubicación mientras la aplicación se está ejecutando en segundo plano.",
     "wifi_hexagon_location_hooks": "Ganchos de ubicación hexagonal Wi-Fi",
     "mxc_top_up_notification_text": "¡Hola {0}! Hoy añadiste {1} MXC a tu billetera. ¡Sigue haciéndola crecer!",
     "mxc_top_up_notification_title": "Felicidades por la nueva Recarga",
@@ -379,16 +379,16 @@
     "wifi_info_notifications_title": "Actualización Exitosa de Transacción Wi-Fi",
     "wifi_info_notifications_text": "Has actualizado con éxito la lista de redes Wi-Fi enviando una transacción al MXC zkEVM.",
     "wifi_info_tx_failed": "¡Vaya, la actualización de la transacción Wi-Fi ha fallado!",
-    "axs_background_location_service_text": "El servicio de ubicación en segundo plano de la billetera AXS para conexiones Wi-Fi está funcionando... .",
-    "axs_background_location_service_title": "Servicio de ubicación de la cartera AXS",
+    "moonchain_background_location_service_text": "El servicio de ubicación en segundo plano de la billetera Moonchain para conexiones Wi-Fi está funcionando... .",
+    "moonchain_background_location_service_title": "Servicio de ubicación de la cartera Moonchain",
     "unable_to_retrieve_wifi_info_successfully": "¡Incapaz de recuperar la información de wifi con éxito!",
     "auto_claim_started": "Inicio de Reclamo Automático 🏁",
     "no_miners_selected_notification_title": "Parece que no has seleccionado ningún minero. ℹ️",
     "no_miners_selected_notification_text": "Por favor, dirígete a la DApp de minería para seleccionar mineros.",
     "auto_claim_successful_notification_title": "Éxito en la auto-reclamación del minero ✅",
-    "auto_claim_successful_notification_text": "La cartera AXS ha sido reclamada exitosamente, has minado tokens.",
+    "auto_claim_successful_notification_text": "La cartera Moonchain ha sido reclamada exitosamente, has minado tokens.",
     "nothing_to_claim_notification_title": "Vaya, Nada que reclamar ℹ️",
-    "nothing_to_claim_notification_text": "La cartera AXS intentó reclamar tus tokens minados, pero no encontró ningún token para reclamar.",
+    "nothing_to_claim_notification_text": "La cartera Moonchain intentó reclamar tus tokens minados, pero no encontró ningún token para reclamar.",
     "auto_claim_failed": "Error en la auto-reclamación del minero ❌",
     "no_miners_owned_notification": "Parece que esta billetera no posee ningún minero. ℹ️",
     "mining_tokens_from_miner": "Extrayendo tokens del Minero #{0}. ⛏️",
@@ -396,9 +396,9 @@
     "tokens_mined_successfully_miner": "Minero #{0}: Tokens minados con éxito. ✅",
     "token_mining_failed": "Minero #{0}: El proceso de minería de tokens ha fallado. ❌",
     "merkle_proof_error": "Error al intentar verificar la prueba de Merkle.",
-    "axs_location_permission_use_case": "La billetera AXS necesita acceso a tu ubicación para funciones como conexiones Wi-Fi mientras la aplicación está en uso o funcionando en segundo plano. Tus datos de ubicación no se guardan ni se comparten con terceros.",
-    "axs_camera_permission_use_case": "La billetera AXS necesita acceso a tu cámara cuando la aplicación está en uso para servicios como la acuñación de RWA. Los datos de imagen no se guardan ni se comparten con terceros.",
-    "axs_photos_permission_use_case": "La billetera AXS necesita acceso a tus fotos para guardar imágenes como RWA. Tus fotos no se guardan ni se comparten con terceros.",
+    "moonchain_location_permission_use_case": "La billetera Moonchain necesita acceso a tu ubicación para funciones como conexiones Wi-Fi mientras la aplicación está en uso o funcionando en segundo plano. Tus datos de ubicación no se guardan ni se comparten con terceros.",
+    "moonchain_camera_permission_use_case": "La billetera Moonchain necesita acceso a tu cámara cuando la aplicación está en uso para servicios como la acuñación de RWA. Los datos de imagen no se guardan ni se comparten con terceros.",
+    "moonchain_photos_permission_use_case": "La billetera Moonchain necesita acceso a tus fotos para guardar imágenes como RWA. Tus fotos no se guardan ni se comparten con terceros.",
     "permission_use_cases": "Casos de uso de permisos",
     "ok_allow": "De acuerdo, Permitir",
     "not_now": "No ahora",
@@ -416,7 +416,7 @@
     "local_secured_storage": "Almacenamiento seguro local",
     "save_locally": "Guardar localmente",
     "save_locally_description": "Asegúrate de guardar tus claves localmente y luego estás listo para continuar.",
-    "axs_storage_permission_use_case": "La billetera AXS necesita acceso a tu almacenamiento para funciones como RWA. Tus datos de almacenamiento no se guardan ni se comparten con terceros.",
+    "moonchain_storage_permission_use_case": "La billetera Moonchain necesita acceso a tu almacenamiento para funciones como RWA. Tus datos de almacenamiento no se guardan ni se comparten con terceros.",
     "local_backup": "Copia de seguridad local",
     "no_description": "Sin descripción",
     "bluetooth_not_supported": "Bluetooth no es compatible con este dispositivo.",
@@ -443,9 +443,9 @@
     "no_rings_selected_notification_title": "Parece que no has seleccionado ningún Anillo de Arándano. ℹ️",
     "no_rings_selected_notification_text": "Por favor, dirígete a la DApp de Blueberry Ring para seleccionar anillos.",
     "auto_sync_successful_notification_title": "El auto-reclamo de Blueberry Ring ha sido exitoso ✅",
-    "auto_sync_successful_notification_text": "La cartera AXS ha sincronizado con éxito tus datos de anillo.",
+    "auto_sync_successful_notification_text": "La cartera Moonchain ha sincronizado con éxito tus datos de anillo.",
     "already_synced_notification_title": "Ups, ya sincronizado ℹ️",
-    "already_synced_notification_text": "La cartera AXS intentó sincronizar tus datos de anillo, pero parece que ya has sincronizado los datos del anillo hoy.",
+    "already_synced_notification_text": "La cartera Moonchain intentó sincronizar tus datos de anillo, pero parece que ya has sincronizado los datos del anillo hoy.",
     "auto_sync_failed": "Falló la sincronización automática de Blueberry Ring ❌",
     "no_rings_owned_notification": "Parece que esta billetera no posee ningún Blueberry Rings. ℹ️",
     "syncing_data_from_ring": "Sincronizando datos desde Blueberry Ring #{0}. ⛏️",
@@ -453,5 +453,23 @@
     "data_synced_successfully_ring": "Anillo de Arándano #{0}: Datos sincronizados con éxito. ✅",
     "data_syncing_failed": "Anillo de Arándano #{0}: El proceso de sincronización de datos ha fallado. ❌",
     "blueberry_hooks": "Ganchos de Arándano",
-    "message": "Mensaje"
+    "message": "Mensaje",
+    "moonchain_username": "Nombre de usuario de Moonchain",
+    "powered_by_moonchain_supernodes": "Impulsado por los Súpernodos de Moonchain",
+    "moonchain_design_documents": "Documentos de diseño de Moonchain",
+    "continue_now": "Continuar ahora",
+    "you_will_be_directed_to_the_main_app": "Se le dirigirá a la aplicación principal",
+    "account_setup_complete": "¡Configuración de la cuenta completada!",
+    "entering_the_app": "Entrando a la Aplicación",
+    "in": "Cargando..",
+    "google_drive_secured_storage": "Almacenamiento seguro de Google Drive",
+    "icloud_secured_storage": "Almacenamiento seguro de iCloud",
+    "make_sure_you_have_stored_your_keys_correctly_in_your_x": "Asegúrate de haber almacenado tus claves correctamente en tu {0}",
+    "icloud": "iCloud",
+    "google_drive": "Google Drive",
+    "store_in_x": "Guardar en {0}",
+    "your_email_address": "Su dirección de correo electrónico",
+    "invalid_email": "Por favor, ingrese una dirección de correo electrónico válida (por ejemplo, name@example.com)",
+    "email": "Correo electrónico",
+    "hello": "Hola"
 }
\ No newline at end of file
diff --git a/assets/flutter_i18n/fr.json b/assets/flutter_i18n/fr.json
index 4a6f6bd6..0b6b34e3 100644
--- a/assets/flutter_i18n/fr.json
+++ b/assets/flutter_i18n/fr.json
@@ -10,11 +10,11 @@
     "confirm_passcode_desc": "Saisissez à nouveau votre code secret",
     "secret_recovery_phrase": "Phrase secrète de récupération",
     "import_your_wallet": "Importez Votre Portefeuille",
-    "word_seed_phrase": "Importez simplement votre portefeuille existant avec votre phrase de récupération de 12, 18 ou 24 mots, ou téléchargez à partir du fichier texte de clé de portefeuille AXS par email et collez la phrase de récupération ici.",
+    "word_seed_phrase": "Importez simplement votre portefeuille existant avec votre phrase de récupération de 12, 18 ou 24 mots, ou téléchargez à partir du fichier texte de clé de portefeuille Moonchain par email et collez la phrase de récupération ici.",
     "confirm": "Confirmer",
     "choose_my_username": "Choisissez mon nom d'utilisateur",
     "mnemonic_passphrase": "Phrase de Passe Mnémonique",
-    "biometrics_setup": "Configuration des biométriques AXS",
+    "biometrics_setup": "Configuration des biométriques Moonchain",
     "mxc_zkevm_username": "Nom d'utilisateur MXC zkEVM",
     "ens_announcement_description": "Avec votre nom d'utilisateur MXC zkEVM unique, le processus fastidieux de gestion des adresses de portefeuille complexes devient une chose du passé. Désormais, vous pouvez utiliser sans effort un nom personnalisé et exclusif qui vous distingue.",
     "choose_your_username": "Choisissez votre nom d'utilisateur unique MXC zkEVM",
@@ -41,12 +41,12 @@
     "send": "Envoyer",
     "received": "Reçu",
     "sent": "Envoyé",
-    "email_secured_body": "Pour la sécurité et la confidentialité de votre portefeuille AXS, il est essentiel que vous gardiez toutes les informations contenues dans cet email strictement confidentielles. \nVeuillez suivre attentivement ces prochaines étapes : \n1. Assurez-vous que vous êtes le seul destinataire de cet email en remplaçant l'adresse du destinataire par la vôtre. \n2. Après avoir confirmé la bonne adresse email, cliquez sur le bouton 'Envoyer' pour transmettre ces informations vitales à vous-même en toute sécurité. En respectant ces mesures, vous garantirez la plus grande sécurité pour votre portefeuille AXS. Merci de votre diligence dans cette affaire.",
-    "email_secured_subject": "Sécurisez Votre Clé de Portefeuille AXS - Instructions Importantes",
+    "email_secured_body": "Pour la sécurité et la confidentialité de votre portefeuille Moonchain, il est essentiel que vous gardiez toutes les informations contenues dans cet email strictement confidentielles. \nVeuillez suivre attentivement ces prochaines étapes : \n1. Assurez-vous que vous êtes le seul destinataire de cet email en remplaçant l'adresse du destinataire par la vôtre. \n2. Après avoir confirmé la bonne adresse email, cliquez sur le bouton 'Envoyer' pour transmettre ces informations vitales à vous-même en toute sécurité. En respectant ces mesures, vous garantirez la plus grande sécurité pour votre portefeuille Moonchain. Merci de votre diligence dans cette affaire.",
+    "email_secured_subject": "Sécurisez Votre Clé de Portefeuille Moonchain - Instructions Importantes",
     "face_id": "Identification Faciale",
     "fingerprint": "Empreinte digitale",
     "touch_id": "Touch ID",
-    "unlock_axs_wallet": "Déverrouillez votre portefeuille AXS",
+    "unlock_moonchain_wallet": "Déverrouillez votre portefeuille Moonchain",
     "enter_your_passcode": "Entrez votre code secret",
     "attempts_x": "{0} sur 6 tentatives",
     "forgot_passcode": "J'ai oublié mon code secret",
@@ -217,8 +217,8 @@
     "networks": "Réseaux",
     "added": "Ajouté",
     "want_to_add_this_network": "Voulez-vous ajouter ce réseau ?",
-    "network_adding_usage_notice": "Ajouter ce réseau permet de l'utiliser au sein de AXS",
-    "custom_network_security_alert": "AXS n'endosse pas les réseaux personnalisés ou leur sécurité.",
+    "network_adding_usage_notice": "Ajouter ce réseau permet de l'utiliser au sein de Moonchain",
+    "custom_network_security_alert": "Moonchain n'endosse pas les réseaux personnalisés ou leur sécurité.",
     "block_explorer_url": "URL de l'explorateur de blocs",
     "new_network_added": "Nouveau réseau ajouté",
     "x_is_now_available": "\"{0}\" est maintenant disponible dans le sélecteur de réseau.",
@@ -288,11 +288,11 @@
     "send_&_receive": "Envoyer & Recevoir",
     "contract": "Contrat",
     "decimals": "Décimales",
-    "add_token_success_message": "Hourra! Le jeton a été ajouté avec succès à votre portefeuille AXS! 🎉",
+    "add_token_success_message": "Hourra! Le jeton a été ajouté avec succès à votre portefeuille Moonchain! 🎉",
     "import_account": "Importer le compte",
     "add_account": "Ajouter un compte",
     "private_key": "Clé privée",
-    "import_notice": "Les comptes importés ne seront pas associés à votre phrase secrète de récupération de portefeuille AXS.",
+    "import_notice": "Les comptes importés ne seront pas associés à votre phrase secrète de récupération de portefeuille Moonchain.",
     "imported": "Importé",
     "view_private_key": "Voir la clé privée",
     "view_private_key_notice": "Avertissement: Ne divulguez jamais cette clé. Toute personne ayant vos clés privées peut voler tous les actifs détenus dans votre compte.",
@@ -302,8 +302,8 @@
     "duplicate_account_import_notice": "Le compte que vous essayez d'importer est un doublon.",
     "unable_to_launch_email_app": "Impossible de lancer l'application email",
     "max_fee": "Frais Maximal",
-    "deposit_from_exchanges_notice": "Achetez auprès de {0}, {1} échanges et déposez directement zkEVM MXC dans le portefeuille AXS",
-    "deposit_with_l3_bridge_notice": "Achetez sur d'autres échanges et utilisez {0} pour déposer ERC20 MXC dans le portefeuille AXS",
+    "deposit_from_exchanges_notice": "Achetez auprès de {0}, {1} échanges et déposez directement zkEVM MXC dans le portefeuille Moonchain",
+    "deposit_with_l3_bridge_notice": "Achetez sur d'autres échanges et utilisez {0} pour déposer ERC20 MXC dans le portefeuille Moonchain",
     "buy_some_x_for_fee_notice": "Achetez un peu de {0} pour payer les frais de gaz pour la transaction, normalement moins de 2 USD lorsque le réseau n'est pas occupé",
     "insufficient_funds_notice": "Solde insuffisant pour cette transaction. Veuillez ajouter des fonds.",
     "contractCall": "Appel de contrat",
@@ -322,8 +322,8 @@
     "gas_fee_replacement_notice": "Cette frais de gaz remplacera l'original.",
     "unknown": "Inconnu",
     "transaction_finalized": "Transaction Finalisée",
-    "background_fetch_notice_title": "Optimisez Votre Expérience de Portefeuille AXS",
-    "background_fetch_notice_text": "Pour garantir une performance optimale du portefeuille AXS, nous recommandons de garder l'application active en arrière-plan et de l'exclure des paramètres d'optimisation de la batterie. Cela aide à maintenir une fonctionnalité sans faille et un accès ininterrompu à votre portefeuille.",
+    "background_fetch_notice_title": "Optimisez Votre Expérience de Portefeuille Moonchain",
+    "background_fetch_notice_text": "Pour garantir une performance optimale du portefeuille Moonchain, nous recommandons de garder l'application active en arrière-plan et de l'exclure des paramètres d'optimisation de la batterie. Cela aide à maintenir une fonctionnalité sans faille et un accès ininterrompu à votre portefeuille.",
     "acknowledge": "Reconnaître",
     "background_notifications_service_launched_successfully": "Le service de notifications en arrière-plan a été lancé avec succès.",
     "unable_to_launch_background_notification_service": "Impossible de lancer le service de notification en arrière-plan.",
@@ -351,7 +351,7 @@
     "auto_claim_execution_dialog_text": "Le temps pour la réclamation automatique a expiré. Souhaitez-vous exécuter la réclamation automatique maintenant?",
     "execute": "Exécutez",
     "auto_claim_scheduling_text": "L'auto-réclamation s'exécutera à {0} demain",
-    "wifi_location_background_fetch_notice_text": "Pour garantir une performance optimale du portefeuille AXS, nous recommandons de garder l'application active en arrière-plan et de l'exclure des paramètres d'optimisation de la batterie. Cela aide à maintenir une fonctionnalité sans faille et un accès ininterrompu à votre portefeuille. Veuillez noter que seuls les crochets de localisation hexagonaux WiFi utiliseront les services de localisation en arrière-plan ; les autres services au sein de l'application n'accéderont pas à votre localisation pendant que l'application fonctionne en arrière-plan.",
+    "wifi_location_background_fetch_notice_text": "Pour garantir une performance optimale du portefeuille Moonchain, nous recommandons de garder l'application active en arrière-plan et de l'exclure des paramètres d'optimisation de la batterie. Cela aide à maintenir une fonctionnalité sans faille et un accès ininterrompu à votre portefeuille. Veuillez noter que seuls les crochets de localisation hexagonaux WiFi utiliseront les services de localisation en arrière-plan ; les autres services au sein de l'application n'accéderont pas à votre localisation pendant que l'application fonctionne en arrière-plan.",
     "wifi_hexagon_location_hooks": "Crochets de localisation hexagonale Wi-Fi",
     "mxc_top_up_notification_text": "Salut {0}! Vous avez ajouté {1} MXC à votre portefeuille aujourd'hui. Continuez à le faire croître!",
     "mxc_top_up_notification_title": "Félicitations pour le nouveau Rechargement",
@@ -379,16 +379,16 @@
     "wifi_info_notifications_title": "Mise à jour réussie de la transaction Wi-Fi",
     "wifi_info_notifications_text": "Vous avez réussi à mettre à jour la liste des réseaux Wi-Fi en soumettant une transaction au MXC zkEVM.",
     "wifi_info_tx_failed": "Oups, la mise à jour de la transaction Wi-Fi a échoué!",
-    "axs_background_location_service_text": "Le service de localisation en arrière-plan du portefeuille AXS pour les points d'accès Wi-Fi est en cours d'exécution... .",
-    "axs_background_location_service_title": "Service de localisation de portefeuille AXS",
+    "moonchain_background_location_service_text": "Le service de localisation en arrière-plan du portefeuille Moonchain pour les points d'accès Wi-Fi est en cours d'exécution... .",
+    "moonchain_background_location_service_title": "Service de localisation de portefeuille Moonchain",
     "unable_to_retrieve_wifi_info_successfully": "Impossible de récupérer les informations wifi avec succès!",
     "auto_claim_started": "Auto Réclamation Commencée 🏁",
     "no_miners_selected_notification_title": "On dirait que vous n'avez sélectionné aucun mineur. ℹ️",
     "no_miners_selected_notification_text": "Veuillez vous rendre sur le DApp de mineur pour sélectionner des mineurs.",
     "auto_claim_successful_notification_title": "Minage auto-réclamation réussi ✅",
-    "auto_claim_successful_notification_text": "Le portefeuille AXS a été revendiqué avec succès, vous avez miné des jetons.",
+    "auto_claim_successful_notification_text": "Le portefeuille Moonchain a été revendiqué avec succès, vous avez miné des jetons.",
     "nothing_to_claim_notification_title": "Oups, Rien à réclamer ℹ️",
-    "nothing_to_claim_notification_text": "Le portefeuille AXS a essayé de réclamer vos tokens minés, mais n'a trouvé aucun token à réclamer.",
+    "nothing_to_claim_notification_text": "Le portefeuille Moonchain a essayé de réclamer vos tokens minés, mais n'a trouvé aucun token à réclamer.",
     "auto_claim_failed": "L'auto-réclamation du mineur a échoué ❌",
     "no_miners_owned_notification": "On dirait que ce portefeuille ne possède aucun mineur. ℹ️",
     "mining_tokens_from_miner": "Extraction de jetons du Mineur #{0}. ⛏️",
@@ -396,9 +396,9 @@
     "tokens_mined_successfully_miner": "Mineur #{0} : Tokens minés avec succès. ✅",
     "token_mining_failed": "Mineur #{0} : Le processus de minage de token a échoué. ❌",
     "merkle_proof_error": "Erreur lors de la tentative de vérification de la preuve de Merkle.",
-    "axs_location_permission_use_case": "Le portefeuille AXS a besoin d'accéder à votre emplacement pour des fonctionnalités telles que les crochets Wi-Fi pendant que l'application est en cours d'utilisation ou fonctionne en arrière-plan. Vos données de localisation ne sont ni sauvegardées ni partagées avec des tiers.",
-    "axs_camera_permission_use_case": "Le portefeuille AXS a besoin d'accéder à votre caméra lorsque l'application est utilisée pour des services tels que la frappe de RWA. Les données d'image ne sont ni sauvegardées ni partagées avec des tiers.",
-    "axs_photos_permission_use_case": "Le portefeuille AXS a besoin d'accéder à vos photos pour sauvegarder des images telles que RWA. Vos photos ne sont pas sauvegardées ou partagées avec des tiers.",
+    "moonchain_location_permission_use_case": "Le portefeuille Moonchain a besoin d'accéder à votre emplacement pour des fonctionnalités telles que les crochets Wi-Fi pendant que l'application est en cours d'utilisation ou fonctionne en arrière-plan. Vos données de localisation ne sont ni sauvegardées ni partagées avec des tiers.",
+    "moonchain_camera_permission_use_case": "Le portefeuille Moonchain a besoin d'accéder à votre caméra lorsque l'application est utilisée pour des services tels que la frappe de RWA. Les données d'image ne sont ni sauvegardées ni partagées avec des tiers.",
+    "moonchain_photos_permission_use_case": "Le portefeuille Moonchain a besoin d'accéder à vos photos pour sauvegarder des images telles que RWA. Vos photos ne sont pas sauvegardées ou partagées avec des tiers.",
     "permission_use_cases": "Cas d'utilisation de permission",
     "ok_allow": "D'accord, Autoriser",
     "not_now": "Pas maintenant",
@@ -416,7 +416,7 @@
     "local_secured_storage": "Stockage sécurisé local",
     "save_locally": "Enregistrez localement",
     "save_locally_description": "Assurez-vous de sauvegarder vos clés localement et ensuite vous êtes prêt à partir.",
-    "axs_storage_permission_use_case": "Le portefeuille AXS a besoin d'accéder à votre stockage pour des fonctionnalités telles que RWA. Vos données de stockage ne sont pas sauvegardées ni partagées avec des tiers.",
+    "moonchain_storage_permission_use_case": "Le portefeuille Moonchain a besoin d'accéder à votre stockage pour des fonctionnalités telles que RWA. Vos données de stockage ne sont pas sauvegardées ni partagées avec des tiers.",
     "local_backup": "Sauvegarde locale",
     "no_description": "Aucune description",
     "bluetooth_not_supported": "Le Bluetooth n'est pas pris en charge sur cet appareil.",
@@ -443,9 +443,9 @@
     "no_rings_selected_notification_title": "On dirait que vous n'avez sélectionné aucun Anneaux de Myrtille. ℹ️",
     "no_rings_selected_notification_text": "Veuillez vous rendre sur Blueberry Ring DApp pour sélectionner des anneaux.",
     "auto_sync_successful_notification_title": "La revendication automatique de Blueberry Ring a réussi ✅",
-    "auto_sync_successful_notification_text": "Le portefeuille AXS a synchronisé avec succès vos données de ring.",
+    "auto_sync_successful_notification_text": "Le portefeuille Moonchain a synchronisé avec succès vos données de ring.",
     "already_synced_notification_title": "Oups, déjà synchronisé ℹ️",
-    "already_synced_notification_text": "Le portefeuille AXS a essayé de synchroniser vos données de ring, mais il semble que vous ayez déjà synchronisé les données de ring aujourd'hui.",
+    "already_synced_notification_text": "Le portefeuille Moonchain a essayé de synchroniser vos données de ring, mais il semble que vous ayez déjà synchronisé les données de ring aujourd'hui.",
     "auto_sync_failed": "L'auto-synchronisation de Blueberry Ring a échoué ❌",
     "no_rings_owned_notification": "On dirait que ce portefeuille ne possède pas de Blueberry Rings. ℹ️",
     "syncing_data_from_ring": "Synchronisation des données à partir de Blueberry Ring #{0}. ⛏️",
@@ -453,5 +453,23 @@
     "data_synced_successfully_ring": "Bague de Myrtille #{0} : Données synchronisées avec succès. ✅",
     "data_syncing_failed": "Bague de Myrtille #{0} : Le processus de synchronisation des données a échoué. ❌",
     "blueberry_hooks": "Crochets de Myrtille",
-    "message": "Message"
+    "message": "Message",
+    "moonchain_username": "Nom d'utilisateur Moonchain",
+    "powered_by_moonchain_supernodes": "Alimenté par les Supernœuds Moonchain",
+    "moonchain_design_documents": "Documents de conception de Moonchain",
+    "continue_now": "Continuer maintenant",
+    "you_will_be_directed_to_the_main_app": "Vous serez redirigé vers l'application principale",
+    "account_setup_complete": "Configuration du compte terminée!",
+    "entering_the_app": "Entrer dans l'application",
+    "in": "Chargement..",
+    "google_drive_secured_storage": "Stockage sécurisé Google Drive",
+    "icloud_secured_storage": "Stockage sécurisé iCloud",
+    "make_sure_you_have_stored_your_keys_correctly_in_your_x": "Assurez-vous d'avoir correctement enregistré vos clés dans votre {0}",
+    "icloud": "iCloud",
+    "google_drive": "Google Drive",
+    "store_in_x": "Stocker dans {0}",
+    "your_email_address": "Votre adresse e-mail",
+    "invalid_email": "Veuillez entrer une adresse électronique valide (par exemple, {nom@example.com})",
+    "email": "Courriel",
+    "hello": "Bonjour"
 }
\ No newline at end of file
diff --git a/assets/flutter_i18n/id.json b/assets/flutter_i18n/id.json
index 2d49ae80..35eca920 100644
--- a/assets/flutter_i18n/id.json
+++ b/assets/flutter_i18n/id.json
@@ -10,11 +10,11 @@
     "confirm_passcode_desc": "Ketik ulang kode sandi Anda",
     "secret_recovery_phrase": "Frasa pemulihan rahasia",
     "import_your_wallet": "Impor Dompet Anda",
-    "word_seed_phrase": "Cukup impor dompet Anda yang ada dengan frasa pemulihan 12, 18, atau 24 kata, atau unduh dari file teks kunci dompet AXS email dan tempelkan frasa pemulihan di sini.",
+    "word_seed_phrase": "Cukup impor dompet Anda yang ada dengan frasa pemulihan 12, 18, atau 24 kata, atau unduh dari file teks kunci dompet Moonchain email dan tempelkan frasa pemulihan di sini.",
     "confirm": "Konfirmasi",
     "choose_my_username": "Pilih nama pengguna saya",
     "mnemonic_passphrase": "Frasa Sandi Mnemonik",
-    "biometrics_setup": "Pengaturan Biometrik AXS",
+    "biometrics_setup": "Pengaturan Biometrik Moonchain",
     "mxc_zkevm_username": "MXC zkEVM Nama Pengguna",
     "ens_announcement_description": "Dengan nama pengguna MXC zkEVM unik Anda, proses rumit penanganan alamat dompet yang kompleks menjadi hal masa lalu. Sekarang, Anda dapat dengan mudah menggunakan nama kustom dan eksklusif yang membedakan Anda.",
     "choose_your_username": "Pilih nama pengguna MXC zkEVM unik Anda",
@@ -41,12 +41,12 @@
     "send": "Kirim",
     "received": "Diterima",
     "sent": "Dikirim",
-    "email_secured_body": "Untuk keamanan dan privasi dompet AXS Anda, sangat penting untuk menjaga semua informasi dalam email ini tetap rahasia.\nSilakan ikuti langkah-langkah berikut dengan hati-hati:\n1. Pastikan Anda adalah satu-satunya penerima email ini dengan mengganti alamat penerima dengan milik Anda sendiri.\n2. Setelah memastikan alamat email yang benar, lanjutkan dengan mengklik tombol 'Kirim' untuk meneruskan informasi penting ini kepada diri Anda sendiri dengan aman. Dengan mematuhi langkah-langkah ini, Anda akan menjamin keamanan tertinggi untuk dompet AXS Anda. Terima kasih atas ketelitian Anda dalam hal ini.",
-    "email_secured_subject": "Amankan Kunci Dompet AXS Anda - Instruksi Penting",
+    "email_secured_body": "Untuk keamanan dan privasi dompet Moonchain Anda, sangat penting untuk menjaga semua informasi dalam email ini tetap rahasia.\nSilakan ikuti langkah-langkah berikut dengan hati-hati:\n1. Pastikan Anda adalah satu-satunya penerima email ini dengan mengganti alamat penerima dengan milik Anda sendiri.\n2. Setelah memastikan alamat email yang benar, lanjutkan dengan mengklik tombol 'Kirim' untuk meneruskan informasi penting ini kepada diri Anda sendiri dengan aman. Dengan mematuhi langkah-langkah ini, Anda akan menjamin keamanan tertinggi untuk dompet Moonchain Anda. Terima kasih atas ketelitian Anda dalam hal ini.",
+    "email_secured_subject": "Amankan Kunci Dompet Moonchain Anda - Instruksi Penting",
     "face_id": "Face ID",
     "fingerprint": "Sidik Jari",
     "touch_id": "Sentuh ID",
-    "unlock_axs_wallet": "Buka dompet AXS Anda",
+    "unlock_moonchain_wallet": "Buka dompet Moonchain Anda",
     "enter_your_passcode": "Masukkan kode sandi Anda",
     "attempts_x": "{0} dari 6 upaya",
     "forgot_passcode": "Saya lupa kode sandi saya",
@@ -217,8 +217,8 @@
     "networks": "Jaringan",
     "added": "Ditambahkan",
     "want_to_add_this_network": "Ingin menambahkan jaringan ini?",
-    "network_adding_usage_notice": "Menambahkan jaringan ini, memungkinkannya untuk digunakan dalam AXS",
-    "custom_network_security_alert": "AXS tidak mendukung jaringan kustom atau keamanannya.",
+    "network_adding_usage_notice": "Menambahkan jaringan ini, memungkinkannya untuk digunakan dalam Moonchain",
+    "custom_network_security_alert": "Moonchain tidak mendukung jaringan kustom atau keamanannya.",
     "block_explorer_url": "URL penjelajah blok",
     "new_network_added": "Jaringan baru ditambahkan",
     "x_is_now_available": "\"{0}\" kini tersedia dalam pemilih jaringan.",
@@ -288,11 +288,11 @@
     "send_&_receive": "Kirim & Terima",
     "contract": "Kontrak",
     "decimals": "Desimal",
-    "add_token_success_message": "Hore! Token telah berhasil ditambahkan ke dompet AXS Anda! 🎉",
+    "add_token_success_message": "Hore! Token telah berhasil ditambahkan ke dompet Moonchain Anda! 🎉",
     "import_account": "Impor akun",
     "add_account": "Tambahkan akun",
     "private_key": "Kunci privat",
-    "import_notice": "Akun yang diimpor tidak akan dikaitkan dengan Frasa Pemulihan Rahasia dompet AXS Anda.",
+    "import_notice": "Akun yang diimpor tidak akan dikaitkan dengan Frasa Pemulihan Rahasia dompet Moonchain Anda.",
     "imported": "Diimpor",
     "view_private_key": "Lihat kunci privat",
     "view_private_key_notice": "Peringatan: Jangan pernah mengungkapkan kunci ini. Siapa saja yang memiliki kunci pribadi Anda dapat mencuri semua aset yang ada di akun Anda.",
@@ -302,8 +302,8 @@
     "duplicate_account_import_notice": "Akun yang Anda coba impor adalah duplikat.",
     "unable_to_launch_email_app": "Tidak dapat meluncurkan aplikasi email",
     "max_fee": "Biaya Maksimal",
-    "deposit_from_exchanges_notice": "Beli dari {0}, {1} bursa dan setor langsung zkEVM MXC ke dompet AXS",
-    "deposit_with_l3_bridge_notice": "Beli dari bursa lain dan gunakan {0} untuk menyetor MXC ERC20 ke dompet AXS",
+    "deposit_from_exchanges_notice": "Beli dari {0}, {1} bursa dan setor langsung zkEVM MXC ke dompet Moonchain",
+    "deposit_with_l3_bridge_notice": "Beli dari bursa lain dan gunakan {0} untuk menyetor MXC ERC20 ke dompet Moonchain",
     "buy_some_x_for_fee_notice": "Beli beberapa {0} untuk membayar biaya gas untuk transaksi, biasanya kurang dari 2 USD saat jaringan tidak sibuk",
     "insufficient_funds_notice": "Saldo tidak cukup untuk transaksi ini. \nSilakan tambahkan dana.",
     "contractCall": "Panggilan kontrak",
@@ -322,8 +322,8 @@
     "gas_fee_replacement_notice": "Biaya gas ini akan menggantikan yang asli.",
     "unknown": "Tidak Dikenal",
     "transaction_finalized": "Transaksi Selesai",
-    "background_fetch_notice_title": "Optimalkan Pengalaman Dompet AXS Anda",
-    "background_fetch_notice_text": "Untuk memastikan kinerja puncak dari Dompet AXS, kami menyarankan untuk menjaga aplikasi tetap aktif di latar belakang dan mengeluarkannya dari pengaturan optimasi baterai. Ini membantu menjaga fungsi yang lancar dan akses yang tidak terputus ke dompet Anda.",
+    "background_fetch_notice_title": "Optimalkan Pengalaman Dompet Moonchain Anda",
+    "background_fetch_notice_text": "Untuk memastikan kinerja puncak dari Dompet Moonchain, kami menyarankan untuk menjaga aplikasi tetap aktif di latar belakang dan mengeluarkannya dari pengaturan optimasi baterai. Ini membantu menjaga fungsi yang lancar dan akses yang tidak terputus ke dompet Anda.",
     "acknowledge": "Mengakui",
     "background_notifications_service_launched_successfully": "Layanan notifikasi latar belakang berhasil diluncurkan.",
     "unable_to_launch_background_notification_service": "Tidak dapat menjalankan layanan notifikasi latar belakang.",
@@ -351,7 +351,7 @@
     "auto_claim_execution_dialog_text": "Waktu untuk klaim otomatis telah berlalu. Apakah Anda ingin melakukan klaim otomatis sekarang?",
     "execute": "Eksekusi",
     "auto_claim_scheduling_text": "Auto-klaim akan dijalankan pada {0} besok",
-    "wifi_location_background_fetch_notice_text": "Untuk memastikan kinerja puncak dari Dompet AXS, kami merekomendasikan untuk menjaga aplikasi tetap aktif di latar belakang dan mengeluarkannya dari pengaturan optimasi baterai. Ini membantu menjaga fungsi yang lancar dan akses tak terputus ke dompet Anda. Harap dicatat bahwa hanya WiFi hexagon location hooks yang akan menggunakan layanan lokasi di latar belakang; layanan lain dalam aplikasi tidak akan mengakses lokasi Anda saat aplikasi berjalan di latar belakang.",
+    "wifi_location_background_fetch_notice_text": "Untuk memastikan kinerja puncak dari Dompet Moonchain, kami merekomendasikan untuk menjaga aplikasi tetap aktif di latar belakang dan mengeluarkannya dari pengaturan optimasi baterai. Ini membantu menjaga fungsi yang lancar dan akses tak terputus ke dompet Anda. Harap dicatat bahwa hanya WiFi hexagon location hooks yang akan menggunakan layanan lokasi di latar belakang; layanan lain dalam aplikasi tidak akan mengakses lokasi Anda saat aplikasi berjalan di latar belakang.",
     "wifi_hexagon_location_hooks": "Lokasi kait heksagon Wi-Fi",
     "mxc_top_up_notification_text": "Hai {0}! Anda telah menambahkan {1} MXC ke dompet Anda hari ini. Terus pertahankan pertumbuhannya!",
     "mxc_top_up_notification_title": "Selamat atas pengisian ulang baru Anda",
@@ -379,16 +379,16 @@
     "wifi_info_notifications_title": "Pembaruan Transaksi Wi-Fi yang Berhasil",
     "wifi_info_notifications_text": "Anda telah berhasil memperbarui daftar jaringan Wi-Fi dengan mengirimkan transaksi ke MXC zkEVM.",
     "wifi_info_tx_failed": "Ups, Pembaruan Transaksi Wi-Fi gagal!",
-    "axs_background_location_service_text": "Layanan lokasi latar belakang dompet AXS untuk koneksi Wi-Fi sedang berjalan... .",
-    "axs_background_location_service_title": "Layanan lokasi dompet AXS",
+    "moonchain_background_location_service_text": "Layanan lokasi latar belakang dompet Moonchain untuk koneksi Wi-Fi sedang berjalan... .",
+    "moonchain_background_location_service_title": "Layanan lokasi dompet Moonchain",
     "unable_to_retrieve_wifi_info_successfully": "Tidak dapat mengambil info wifi dengan sukses!",
     "auto_claim_started": "Klaim Otomatis Dimulai 🏁",
     "no_miners_selected_notification_title": "Sepertinya Anda belum memilih penambang mana pun. ℹ️",
     "no_miners_selected_notification_text": "Silakan menuju ke miner DApp untuk memilih penambang.",
     "auto_claim_successful_notification_title": "Penambang klaim otomatis berhasil ✅",
-    "auto_claim_successful_notification_text": "Dompet AXS telah berhasil diklaim, Anda telah menambang token.",
+    "auto_claim_successful_notification_text": "Dompet Moonchain telah berhasil diklaim, Anda telah menambang token.",
     "nothing_to_claim_notification_title": "Ups, Tidak ada yang bisa diklaim ℹ️",
-    "nothing_to_claim_notification_text": "Dompet AXS mencoba untuk mengklaim token yang telah Anda tambang, tetapi tidak menemukan token apa pun untuk diklaim.",
+    "nothing_to_claim_notification_text": "Dompet Moonchain mencoba untuk mengklaim token yang telah Anda tambang, tetapi tidak menemukan token apa pun untuk diklaim.",
     "auto_claim_failed": "Gagal klaim otomatis penambang ❌",
     "no_miners_owned_notification": "Sepertinya dompet ini tidak memiliki penambang. ℹ️",
     "mining_tokens_from_miner": "Menambang token dari Penambang #{0}. ⛏️",
@@ -396,9 +396,9 @@
     "tokens_mined_successfully_miner": "Penambang #{0}: Token berhasil ditambang. ✅",
     "token_mining_failed": "Penambang #{0}: Proses penambangan token gagal. ❌",
     "merkle_proof_error": "Kesalahan saat mencoba memverifikasi bukti Merkle.",
-    "axs_location_permission_use_case": "Dompet AXS membutuhkan akses ke lokasi Anda untuk fitur seperti Wi-Fi hooks saat aplikasi sedang digunakan atau berjalan di latar belakang. Data lokasi Anda tidak disimpan atau dibagikan dengan pihak ketiga mana pun.",
-    "axs_camera_permission_use_case": "Dompet AXS membutuhkan akses ke kamera Anda saat aplikasi sedang digunakan untuk layanan seperti pencetakan RWA. Data gambar tidak disimpan atau dibagikan dengan pihak ketiga mana pun.",
-    "axs_photos_permission_use_case": "Dompet AXS membutuhkan akses ke foto-foto Anda untuk menyimpan gambar seperti RWA. Foto-foto Anda tidak disimpan atau dibagikan dengan pihak ketiga mana pun.",
+    "moonchain_location_permission_use_case": "Dompet Moonchain membutuhkan akses ke lokasi Anda untuk fitur seperti Wi-Fi hooks saat aplikasi sedang digunakan atau berjalan di latar belakang. Data lokasi Anda tidak disimpan atau dibagikan dengan pihak ketiga mana pun.",
+    "moonchain_camera_permission_use_case": "Dompet Moonchain membutuhkan akses ke kamera Anda saat aplikasi sedang digunakan untuk layanan seperti pencetakan RWA. Data gambar tidak disimpan atau dibagikan dengan pihak ketiga mana pun.",
+    "moonchain_photos_permission_use_case": "Dompet Moonchain membutuhkan akses ke foto-foto Anda untuk menyimpan gambar seperti RWA. Foto-foto Anda tidak disimpan atau dibagikan dengan pihak ketiga mana pun.",
     "permission_use_cases": "Kasus penggunaan izin",
     "ok_allow": "Oke, Izinkan",
     "not_now": "Tidak sekarang",
@@ -416,7 +416,7 @@
     "local_secured_storage": "Penyimpanan lokal yang aman",
     "save_locally": "Simpan secara lokal",
     "save_locally_description": "Pastikan untuk menyimpan kunci Anda secara lokal dan kemudian Anda siap untuk melanjutkan.",
-    "axs_storage_permission_use_case": "Dompet AXS membutuhkan akses ke penyimpanan Anda untuk fitur seperti RWA. Data penyimpanan Anda tidak disimpan atau dibagikan dengan pihak ketiga mana pun.",
+    "moonchain_storage_permission_use_case": "Dompet Moonchain membutuhkan akses ke penyimpanan Anda untuk fitur seperti RWA. Data penyimpanan Anda tidak disimpan atau dibagikan dengan pihak ketiga mana pun.",
     "local_backup": "Cadangan lokal",
     "no_description": "Tidak ada deskripsi",
     "bluetooth_not_supported": "Bluetooth tidak didukung pada perangkat ini.",
@@ -443,9 +443,9 @@
     "no_rings_selected_notification_title": "Sepertinya Anda belum memilih Blueberry Rings apa pun. ℹ️",
     "no_rings_selected_notification_text": "Silakan menuju ke Blueberry Ring DApp untuk memilih cincin.",
     "auto_sync_successful_notification_title": "Berhasil klaim otomatis Blueberry Ring ✅",
-    "auto_sync_successful_notification_text": "Dompet AXS telah berhasil menyinkronkan data cincin Anda.",
+    "auto_sync_successful_notification_text": "Dompet Moonchain telah berhasil menyinkronkan data cincin Anda.",
     "already_synced_notification_title": "Ups, Sudah disinkronkan ℹ️",
-    "already_synced_notification_text": "Dompet AXS mencoba untuk menyinkronkan data ring Anda, Tetapi tampaknya Anda telah menyinkronkan data ring hari ini.",
+    "already_synced_notification_text": "Dompet Moonchain mencoba untuk menyinkronkan data ring Anda, Tetapi tampaknya Anda telah menyinkronkan data ring hari ini.",
     "auto_sync_failed": "Gagal sinkronisasi otomatis Blueberry Ring ❌",
     "no_rings_owned_notification": "Sepertinya dompet ini tidak memiliki Blueberry Rings. ℹ️",
     "syncing_data_from_ring": "Menyinkronkan data dari Blueberry Ring #{0}. ⛏️",
@@ -453,5 +453,23 @@
     "data_synced_successfully_ring": "Cincin Blueberry #{0}: Data berhasil disinkronkan. ✅",
     "data_syncing_failed": "Cincin Blueberry #{0}: Proses sinkronisasi data gagal. ❌",
     "blueberry_hooks": "Kait Blueberry",
-    "message": "Pesan"
+    "message": "Pesan",
+    "moonchain_username": "Nama Pengguna Moonchain",
+    "powered_by_moonchain_supernodes": "Didukung oleh Supernode Moonchain",
+    "moonchain_design_documents": "Dokumen desain Moonchain",
+    "continue_now": "Lanjutkan Sekarang",
+    "you_will_be_directed_to_the_main_app": "Anda akan diarahkan ke aplikasi utama",
+    "account_setup_complete": "Pengaturan Akun Selesai!",
+    "entering_the_app": "Memasuki Aplikasi",
+    "in": "Memuat..",
+    "google_drive_secured_storage": "Penyimpanan yang aman di Google Drive",
+    "icloud_secured_storage": "Penyimpanan yang Diproteksi iCloud",
+    "make_sure_you_have_stored_your_keys_correctly_in_your_x": "Pastikan Anda telah menyimpan kunci Anda dengan benar di {0}",
+    "icloud": "iCloud",
+    "google_drive": "Google Drive",
+    "store_in_x": "Simpan di {0}",
+    "your_email_address": "Alamat Email Anda",
+    "invalid_email": "Harap masukkan alamat email yang valid (misalnya, nama@contoh.com)",
+    "email": "Surel",
+    "hello": "Halo"
 }
\ No newline at end of file
diff --git a/assets/flutter_i18n/it.json b/assets/flutter_i18n/it.json
index 0c3cfbe8..a6db7932 100644
--- a/assets/flutter_i18n/it.json
+++ b/assets/flutter_i18n/it.json
@@ -10,11 +10,11 @@
     "confirm_passcode_desc": "Reinserisci il tuo codice di accesso",
     "secret_recovery_phrase": "Frase segreta di recupero",
     "import_your_wallet": "Importa il Tuo Portafoglio",
-    "word_seed_phrase": "Importa semplicemente il tuo portafoglio esistente con la tua frase di recupero di 12, 18 o 24 parole, oppure scarica dal file di testo della chiave del portafoglio AXS inviato via email e incolla la frase di recupero qui.",
+    "word_seed_phrase": "Importa semplicemente il tuo portafoglio esistente con la tua frase di recupero di 12, 18 o 24 parole, oppure scarica dal file di testo della chiave del portafoglio Moonchain inviato via email e incolla la frase di recupero qui.",
     "confirm": "Conferma",
     "choose_my_username": "Scegli il mio nome utente",
     "mnemonic_passphrase": "Frase d'accesso mnemonica",
-    "biometrics_setup": "Configurazione Biometrica AXS",
+    "biometrics_setup": "Configurazione Biometrica Moonchain",
     "mxc_zkevm_username": "Nome utente MXC zkEVM",
     "ens_announcement_description": "Con il tuo unico nome utente MXC zkEVM, l'ingombrante processo di gestione di complessi indirizzi di portafoglio diventa un ricordo del passato. Ora, puoi utilizzare senza sforzo un nome personalizzato ed esclusivo che ti distingue.",
     "choose_your_username": "Scegli il tuo unico nome utente MXC zkEVM",
@@ -41,12 +41,12 @@
     "send": "Invia",
     "received": "Ricevuto",
     "sent": "Inviato",
-    "email_secured_body": "Per la sicurezza e la privacy del tuo portafoglio AXS è essenziale che tu mantenga tutte le informazioni contenute in questa email strettamente riservate. \nSi prega di seguire attentamente i prossimi passaggi: \n1. Assicurati di essere l'unico destinatario di questa email sostituendo l'indirizzo del destinatario con il tuo. \n2. Dopo aver confermato il corretto indirizzo email, procedi a cliccare sul pulsante 'Invia' per inoltrare queste informazioni vitali a te stesso in modo sicuro. Adempiendo a queste misure, garantirai la massima sicurezza per il tuo portafoglio AXS. Grazie per la tua diligenza in questo caso.",
-    "email_secured_subject": "Proteggi la Tua Chiave del Portafoglio AXS - Istruzioni Importanti",
+    "email_secured_body": "Per la sicurezza e la privacy del tuo portafoglio Moonchain è essenziale che tu mantenga tutte le informazioni contenute in questa email strettamente riservate. \nSi prega di seguire attentamente i prossimi passaggi: \n1. Assicurati di essere l'unico destinatario di questa email sostituendo l'indirizzo del destinatario con il tuo. \n2. Dopo aver confermato il corretto indirizzo email, procedi a cliccare sul pulsante 'Invia' per inoltrare queste informazioni vitali a te stesso in modo sicuro. Adempiendo a queste misure, garantirai la massima sicurezza per il tuo portafoglio Moonchain. Grazie per la tua diligenza in questo caso.",
+    "email_secured_subject": "Proteggi la Tua Chiave del Portafoglio Moonchain - Istruzioni Importanti",
     "face_id": "Face ID",
     "fingerprint": "Impronta digitale",
     "touch_id": "Touch ID",
-    "unlock_axs_wallet": "Sblocca il tuo portafoglio AXS",
+    "unlock_moonchain_wallet": "Sblocca il tuo portafoglio Moonchain",
     "enter_your_passcode": "Inserisci il tuo codice di accesso",
     "attempts_x": "{0} su 6 tentativi",
     "forgot_passcode": "Ho dimenticato il mio codice di accesso",
@@ -217,8 +217,8 @@
     "networks": "Reti",
     "added": "Aggiunto",
     "want_to_add_this_network": "Vuoi aggiungere questa rete?",
-    "network_adding_usage_notice": "Aggiungendo questa rete, permette di utilizzarla all'interno di AXS",
-    "custom_network_security_alert": "AXS non approva le reti personalizzate o la loro sicurezza.",
+    "network_adding_usage_notice": "Aggiungendo questa rete, permette di utilizzarla all'interno di Moonchain",
+    "custom_network_security_alert": "Moonchain non approva le reti personalizzate o la loro sicurezza.",
     "block_explorer_url": "URL dell'esploratore di blocchi",
     "new_network_added": "Nuova rete aggiunta",
     "x_is_now_available": "\"{0}\" è ora disponibile nel selettore di rete.",
@@ -288,11 +288,11 @@
     "send_&_receive": "Invia & Ricevi",
     "contract": "Contratto",
     "decimals": "Decimali",
-    "add_token_success_message": "Evviva! Il token è stato aggiunto con successo al tuo portafoglio AXS! 🎉",
+    "add_token_success_message": "Evviva! Il token è stato aggiunto con successo al tuo portafoglio Moonchain! 🎉",
     "import_account": "Importa account",
     "add_account": "Aggiungi account",
     "private_key": "Chiave privata",
-    "import_notice": "Gli account importati non saranno associati alla tua Frase Segreta di Recupero del portafoglio AXS.",
+    "import_notice": "Gli account importati non saranno associati alla tua Frase Segreta di Recupero del portafoglio Moonchain.",
     "imported": "Importato",
     "view_private_key": "Visualizza chiave privata",
     "view_private_key_notice": "Attenzione: Non rivelare mai questa chiave. Chiunque abbia le tue chiavi private può rubare qualsiasi asset detenuto nel tuo account.",
@@ -302,8 +302,8 @@
     "duplicate_account_import_notice": "L'account che stai cercando di importare è un duplicato.",
     "unable_to_launch_email_app": "Impossibile avviare l'app di posta elettronica",
     "max_fee": "Commissione Massima",
-    "deposit_from_exchanges_notice": "Acquista da {0}, {1} scambi e deposita direttamente zkEVM MXC nel portafoglio AXS",
-    "deposit_with_l3_bridge_notice": "Acquista da altri exchange e usa {0} per depositare MXC ERC20 nel portafoglio AXS",
+    "deposit_from_exchanges_notice": "Acquista da {0}, {1} scambi e deposita direttamente zkEVM MXC nel portafoglio Moonchain",
+    "deposit_with_l3_bridge_notice": "Acquista da altri exchange e usa {0} per depositare MXC ERC20 nel portafoglio Moonchain",
     "buy_some_x_for_fee_notice": "Acquista un po' di {0} per pagare la commissione di gas per la transazione, normalmente meno di 2 USD quando la rete non è occupata.",
     "insufficient_funds_notice": "Saldo insufficiente per questa transazione. Per favore, aggiungi fondi.",
     "contractCall": "Chiamata del contratto",
@@ -322,8 +322,8 @@
     "gas_fee_replacement_notice": "Questa commissione gas sostituirà l'originale.",
     "unknown": "Sconosciuto",
     "transaction_finalized": "Transazione Finalizzata",
-    "background_fetch_notice_title": "Ottimizza la tua esperienza con il portafoglio AXS",
-    "background_fetch_notice_text": "Per garantire le massime prestazioni del portafoglio AXS, consigliamo di mantenere l'app attiva in background ed escluderla dalle impostazioni di ottimizzazione della batteria. Questo aiuta a mantenere una funzionalità senza interruzioni e un accesso ininterrotto al tuo portafoglio.",
+    "background_fetch_notice_title": "Ottimizza la tua esperienza con il portafoglio Moonchain",
+    "background_fetch_notice_text": "Per garantire le massime prestazioni del portafoglio Moonchain, consigliamo di mantenere l'app attiva in background ed escluderla dalle impostazioni di ottimizzazione della batteria. Questo aiuta a mantenere una funzionalità senza interruzioni e un accesso ininterrotto al tuo portafoglio.",
     "acknowledge": "Riconosci",
     "background_notifications_service_launched_successfully": "Il servizio di notifiche in background è stato avviato con successo.",
     "unable_to_launch_background_notification_service": "Impossibile avviare il servizio di notifica in background.",
@@ -351,7 +351,7 @@
     "auto_claim_execution_dialog_text": "Il tempo per la richiesta automatica è trascorso. Vorresti eseguire la richiesta automatica ora?",
     "execute": "Esegui",
     "auto_claim_scheduling_text": "L'auto-reclamo verrà eseguito alle {0} di domani",
-    "wifi_location_background_fetch_notice_text": "Per garantire le massime prestazioni del portafoglio AXS, consigliamo di mantenere l'app attiva in background ed escluderla dalle impostazioni di ottimizzazione della batteria. Questo aiuta a mantenere una funzionalità senza interruzioni e un accesso ininterrotto al tuo portafoglio. Si prega di notare che solo i ganci di posizione esagonali WiFi utilizzeranno i servizi di localizzazione in background; altri servizi all'interno dell'app non accederanno alla tua posizione mentre l'app è in esecuzione in background.",
+    "wifi_location_background_fetch_notice_text": "Per garantire le massime prestazioni del portafoglio Moonchain, consigliamo di mantenere l'app attiva in background ed escluderla dalle impostazioni di ottimizzazione della batteria. Questo aiuta a mantenere una funzionalità senza interruzioni e un accesso ininterrotto al tuo portafoglio. Si prega di notare che solo i ganci di posizione esagonali WiFi utilizzeranno i servizi di localizzazione in background; altri servizi all'interno dell'app non accederanno alla tua posizione mentre l'app è in esecuzione in background.",
     "wifi_hexagon_location_hooks": "Ganci di posizione esagonali Wi-Fi",
     "mxc_top_up_notification_text": "Ciao {0}! Hai aggiunto {1} MXC al tuo portafoglio oggi. Continua a farlo crescere!",
     "mxc_top_up_notification_title": "Congratulazioni per la nuova Ricarica",
@@ -379,16 +379,16 @@
     "wifi_info_notifications_title": "Aggiornamento di Transazione Wi-Fi Riuscita",
     "wifi_info_notifications_text": "Hai aggiornato con successo l'elenco delle reti Wi-Fi inviando una transazione alla MXC zkEVM.",
     "wifi_info_tx_failed": "Oops, l'aggiornamento della transazione Wi-Fi è fallito!",
-    "axs_background_location_service_text": "Il servizio di localizzazione in background del portafoglio AXS per i collegamenti Wi-Fi è in esecuzione... .",
-    "axs_background_location_service_title": "Servizio di localizzazione del portafoglio AXS",
+    "moonchain_background_location_service_text": "Il servizio di localizzazione in background del portafoglio Moonchain per i collegamenti Wi-Fi è in esecuzione... .",
+    "moonchain_background_location_service_title": "Servizio di localizzazione del portafoglio Moonchain",
     "unable_to_retrieve_wifi_info_successfully": "Impossibile recuperare con successo le informazioni wifi!",
     "auto_claim_started": "Inizio Auto Claim 🏁",
     "no_miners_selected_notification_title": "Sembra che non hai selezionato nessun minatore. ℹ️",
     "no_miners_selected_notification_text": "Si prega di dirigerti verso il miner DApp per selezionare i minatori.",
     "auto_claim_successful_notification_title": "Minatore auto-reclamo riuscito ✅",
-    "auto_claim_successful_notification_text": "Il portafoglio AXS è stato rivendicato con successo, hai estratto i token.",
+    "auto_claim_successful_notification_text": "Il portafoglio Moonchain è stato rivendicato con successo, hai estratto i token.",
     "nothing_to_claim_notification_title": "Oops, Niente da reclamare ℹ️",
-    "nothing_to_claim_notification_text": "Il portafoglio AXS ha cercato di richiedere i tuoi token minati, ma non ha trovato alcun token da richiedere.",
+    "nothing_to_claim_notification_text": "Il portafoglio Moonchain ha cercato di richiedere i tuoi token minati, ma non ha trovato alcun token da richiedere.",
     "auto_claim_failed": "Aut-claim del minatore fallito ❌",
     "no_miners_owned_notification": "Sembra che questo portafoglio non possieda alcun minatore. ℹ️",
     "mining_tokens_from_miner": "Estrazione di token dal Minatore #{0}. ⛏️",
@@ -396,9 +396,9 @@
     "tokens_mined_successfully_miner": "Minatore #{0}: Token minati con successo. ✅",
     "token_mining_failed": "Minatore #{0}: Il processo di estrazione del token è fallito. ❌",
     "merkle_proof_error": "Errore durante il tentativo di verificare la prova di Merkle.",
-    "axs_location_permission_use_case": "Il portafoglio AXS necessita l'accesso alla tua posizione per funzionalità come i collegamenti Wi-Fi mentre l'app è in uso o in esecuzione in background. I tuoi dati di localizzazione non vengono salvati o condivisi con terze parti.",
-    "axs_camera_permission_use_case": "Il portafoglio AXS necessita l'accesso alla tua fotocamera quando l'app è in uso per servizi come la coniazione di RWA. I dati dell'immagine non vengono salvati o condivisi con terze parti.",
-    "axs_photos_permission_use_case": "Il portafoglio AXS necessita l'accesso alle tue foto per salvare immagini come RWA. Le tue foto non vengono salvate o condivise con terze parti.",
+    "moonchain_location_permission_use_case": "Il portafoglio Moonchain necessita l'accesso alla tua posizione per funzionalità come i collegamenti Wi-Fi mentre l'app è in uso o in esecuzione in background. I tuoi dati di localizzazione non vengono salvati o condivisi con terze parti.",
+    "moonchain_camera_permission_use_case": "Il portafoglio Moonchain necessita l'accesso alla tua fotocamera quando l'app è in uso per servizi come la coniazione di RWA. I dati dell'immagine non vengono salvati o condivisi con terze parti.",
+    "moonchain_photos_permission_use_case": "Il portafoglio Moonchain necessita l'accesso alle tue foto per salvare immagini come RWA. Le tue foto non vengono salvate o condivise con terze parti.",
     "permission_use_cases": "Casi d'uso del permesso",
     "ok_allow": "OK, Permetti",
     "not_now": "Non ora",
@@ -416,7 +416,7 @@
     "local_secured_storage": "Archiviazione sicura locale",
     "save_locally": "Salva localmente",
     "save_locally_description": "Assicurati di salvare le tue chiavi localmente e poi sei pronto per andare.",
-    "axs_storage_permission_use_case": "Il portafoglio AXS necessita l'accesso al tuo spazio di archiviazione per funzioni come RWA. I tuoi dati di archiviazione non vengono salvati o condivisi con terze parti.",
+    "moonchain_storage_permission_use_case": "Il portafoglio Moonchain necessita l'accesso al tuo spazio di archiviazione per funzioni come RWA. I tuoi dati di archiviazione non vengono salvati o condivisi con terze parti.",
     "local_backup": "Backup locale",
     "no_description": "Nessuna descrizione",
     "bluetooth_not_supported": "Il Bluetooth non è supportato su questo dispositivo.",
@@ -443,9 +443,9 @@
     "no_rings_selected_notification_title": "Sembra che non hai selezionato nessun Blueberry Rings. ℹ️",
     "no_rings_selected_notification_text": "Si prega di recarsi alla DApp Blueberry Ring per selezionare gli anelli.",
     "auto_sync_successful_notification_title": "Il reclamo automatico di Blueberry Ring è stato eseguito con successo ✅",
-    "auto_sync_successful_notification_text": "Il tuo portafoglio AXS ha sincronizzato con successo i tuoi dati dell'anello.",
+    "auto_sync_successful_notification_text": "Il tuo portafoglio Moonchain ha sincronizzato con successo i tuoi dati dell'anello.",
     "already_synced_notification_title": "Ops, già sincronizzato ℹ️",
-    "already_synced_notification_text": "Il portafoglio AXS ha cercato di sincronizzare i tuoi dati del ring, ma sembra che tu abbia già sincronizzato i dati del ring oggi.",
+    "already_synced_notification_text": "Il portafoglio Moonchain ha cercato di sincronizzare i tuoi dati del ring, ma sembra che tu abbia già sincronizzato i dati del ring oggi.",
     "auto_sync_failed": "Blueberry Ring auto-sync non riuscita ❌",
     "no_rings_owned_notification": "Sembra che questo portafoglio non possieda nessun Blueberry Rings. ℹ️",
     "syncing_data_from_ring": "Sincronizzazione dei dati da Blueberry Ring #{0}. ⛏️",
@@ -453,5 +453,23 @@
     "data_synced_successfully_ring": "Anello di Mirtilli #{0}: Dati sincronizzati con successo. ✅",
     "data_syncing_failed": "Anello di Mirtilli #{0}: Il processo di sincronizzazione dei dati è fallito. ❌",
     "blueberry_hooks": "Ganci Blueberry",
-    "message": "Messaggio"
+    "message": "Messaggio",
+    "moonchain_username": "Nome utente Moonchain",
+    "powered_by_moonchain_supernodes": "Alimentato da Moonchain Supernodes",
+    "moonchain_design_documents": "Documenti di progettazione di Moonchain",
+    "continue_now": "Continua ora",
+    "you_will_be_directed_to_the_main_app": "Verrai indirizzato all'app principale",
+    "account_setup_complete": "Impostazione account completata!",
+    "entering_the_app": "Entrare nell'app",
+    "in": "Caricamento..",
+    "google_drive_secured_storage": "Archiviazione sicura di Google Drive",
+    "icloud_secured_storage": "Archiviazione protetta da iCloud",
+    "make_sure_you_have_stored_your_keys_correctly_in_your_x": "Assicurati di aver memorizzato correttamente le tue chiavi nel tuo {0}",
+    "icloud": "iCloud",
+    "google_drive": "Google Drive",
+    "store_in_x": "Memorizza in {0}",
+    "your_email_address": "Il tuo indirizzo email",
+    "invalid_email": "Inserisci un indirizzo email valido (es. nome@esempio.com)",
+    "email": "Email",
+    "hello": "Ciao"
 }
\ No newline at end of file
diff --git a/assets/flutter_i18n/ja.json b/assets/flutter_i18n/ja.json
index 59f634b0..b52a8c91 100644
--- a/assets/flutter_i18n/ja.json
+++ b/assets/flutter_i18n/ja.json
@@ -10,11 +10,11 @@
     "confirm_passcode_desc": "パスコードを再入力してください",
     "secret_recovery_phrase": "秘密の回復フレーズ",
     "import_your_wallet": "ウォレットをインポートしてください",
-    "word_seed_phrase": "あなたの12、18、または24語のリカバリーフレーズで既存のウォレットを簡単にインポートするか、メールからAXSウォレットキーテキストファイルをダウンロードして、リカバリーフレーズをここに貼り付けてください。",
+    "word_seed_phrase": "あなたの12、18、または24語のリカバリーフレーズで既存のウォレットを簡単にインポートするか、メールからMoonchainウォレットキーテキストファイルをダウンロードして、リカバリーフレーズをここに貼り付けてください。",
     "confirm": "確認",
     "choose_my_username": "ユーザーネームを選択する",
     "mnemonic_passphrase": "ニーモニックパスフレーズ",
-    "biometrics_setup": "AXS バイオメトリクス設定",
+    "biometrics_setup": "Moonchain バイオメトリクス設定",
     "mxc_zkevm_username": "MXC zkEVM ユーザーネーム",
     "ens_announcement_description": "あなたのユニークなMXC zkEVMユーザーネームを使用すると、複雑なウォレットアドレスの取り扱いが煩わしい過去のものになります。今では、あなたを際立たせるカスタマイズ可能で独占的な名前を簡単に使用できます。",
     "choose_your_username": "あなたのユニークなMXC zkEVMユーザーネームを選択してください",
@@ -41,12 +41,12 @@
     "send": "送信",
     "received": "受け取りました",
     "sent": "送信済み",
-    "email_secured_body": "あなたのAXSウォレットのセキュリティとプライバシーを保つために、このメールに含まれるすべての情報を厳密に秘密にしてください。\n次の手順に注意深く従ってください：\n1. このメールの唯一の受信者であることを確認するために、受信者のアドレスを自分のものに置き換えてください。\n2. 正しいメールアドレスを確認した後、'送信'ボタンをクリックしてこの重要な情報を安全に自分宛てに転送します。これらの措置を遵守することで、あなたのAXSウォレットの最高の安全性を確保します。この件に対するあなたの注意深さに感謝します。",
-    "email_secured_subject": "あなたのAXSウォレットキーを保護 - 重要な指示",
+    "email_secured_body": "あなたのMoonchainウォレットのセキュリティとプライバシーを保つために、このメールに含まれるすべての情報を厳密に秘密にしてください。\n次の手順に注意深く従ってください：\n1. このメールの唯一の受信者であることを確認するために、受信者のアドレスを自分のものに置き換えてください。\n2. 正しいメールアドレスを確認した後、'送信'ボタンをクリックしてこの重要な情報を安全に自分宛てに転送します。これらの措置を遵守することで、あなたのMoonchainウォレットの最高の安全性を確保します。この件に対するあなたの注意深さに感謝します。",
+    "email_secured_subject": "あなたのMoonchainウォレットキーを保護 - 重要な指示",
     "face_id": "顔認証 ID",
     "fingerprint": "指紋認証",
     "touch_id": "Touch ID",
-    "unlock_axs_wallet": "あなたのAXSウォレットを解除してください",
+    "unlock_moonchain_wallet": "あなたのMoonchainウォレットを解除してください",
     "enter_your_passcode": "パスコードを入力してください",
     "attempts_x": "6回中の{0}回",
     "forgot_passcode": "パスコードを忘れました",
@@ -217,8 +217,8 @@
     "networks": "ネットワーク",
     "added": "追加されました",
     "want_to_add_this_network": "このネットワークを追加しますか？",
-    "network_adding_usage_notice": "このネットワークを追加すると、AXS内で使用できるようになります。",
-    "custom_network_security_alert": "AXSはカスタムネットワークやそのセキュリティを推奨していません。",
+    "network_adding_usage_notice": "このネットワークを追加すると、Moonchain内で使用できるようになります。",
+    "custom_network_security_alert": "Moonchainはカスタムネットワークやそのセキュリティを推奨していません。",
     "block_explorer_url": "ブロックエクスプローラURL",
     "new_network_added": "新しいネットワークが追加されました",
     "x_is_now_available": "\"{0}\"はネットワークセレクターで利用可能になりました。",
@@ -242,7 +242,7 @@
     "confirm_delete_wallet": "あなたは本当にウォレットをリセットしますか？",
     "confirm_delete_wallet_note": "この操作は元に戻せませんのでご注意ください。ウォレットをリセットすると、保存されているすべてのデータ、支払い方法、取引履歴、および任意のデジタル通貨（該当する場合）が永久に削除されます。\n\nウォレットのバックアップをまだ行っていない場合は、重要な情報や資産を失わないように、今すぐ行うことを強くお勧めします。",
     "understand_delete": "了解しました、リセット",
-    "delete_wallet_warning": "\"はい\"と入力して現在のウォレットをリセットしてください",
+    "delete_wallet_warning": "\"yes\"と入力して現在のウォレットをリセットしてください",
     "type_yes": "\"yes\"を入力してください",
     "clear_browser_successfully": "履歴とクッキーの削除に成功しました",
     "exported_logs_successfully": "ログのエクスポートに成功しました",
@@ -288,11 +288,11 @@
     "send_&_receive": "送信＆受信",
     "contract": "契約",
     "decimals": "小数点",
-    "add_token_success_message": "万歳！トークンがあなたのAXSウォレットに成功的に追加されました！🎉",
+    "add_token_success_message": "万歳！トークンがあなたのMoonchainウォレットに成功的に追加されました！🎉",
     "import_account": "アカウントをインポートする",
     "add_account": "アカウントを追加する",
     "private_key": "プライベートキー",
-    "import_notice": "インポートされたアカウントは、あなたのAXSウォレットのシークレットリカバリーフレーズと関連付けられません。",
+    "import_notice": "インポートされたアカウントは、あなたのMoonchainウォレットのシークレットリカバリーフレーズと関連付けられません。",
     "imported": "輸入された",
     "view_private_key": "プライベートキーを表示する",
     "view_private_key_notice": "警告：このキーを絶対に公開しないでください。あなたのプライベートキーを持っている人は、あなたのアカウントに保管されている資産を盗むことができます。",
@@ -302,8 +302,8 @@
     "duplicate_account_import_notice": "あなたがインポートしようとしているアカウントは重複しています。",
     "unable_to_launch_email_app": "メールアプリを起動できません",
     "max_fee": "最大手数料",
-    "deposit_from_exchanges_notice": "{0}から購入し、{1}の取引所でzkEVM MXCを直接AXSウォレットに預けてください。",
-    "deposit_with_l3_bridge_notice": "他の取引所から購入し、{0}を使用してERC20 MXCをAXSウォレットに預ける",
+    "deposit_from_exchanges_notice": "{0}から購入し、{1}の取引所でzkEVM MXCを直接Moonchainウォレットに預けてください。",
+    "deposit_with_l3_bridge_notice": "他の取引所から購入し、{0}を使用してERC20 MXCをMoonchainウォレットに預ける",
     "buy_some_x_for_fee_notice": "取引のガス料を支払うために{0}をいくつか購入してください。通常、ネットワークが混雑していないときは2ドル未満です。",
     "insufficient_funds_notice": "このトランザクションには残高が不足しています。資金を追加してください。",
     "contractCall": "契約の呼び出し",
@@ -322,8 +322,8 @@
     "gas_fee_replacement_notice": "このガス料金は元のものを置き換えます。",
     "unknown": "未知の",
     "transaction_finalized": "取引が完了しました",
-    "background_fetch_notice_title": "あなたのAXSウォレット体験を最適化する",
-    "background_fetch_notice_text": "AXSウォレットの最高性能を確保するために、アプリをバックグラウンドでアクティブに保ち、バッテリー最適化設定から除外することをお勧めします。これにより、ウォレットへのアクセスが途切れることなく、機能がスムーズに維持されます。",
+    "background_fetch_notice_title": "あなたのMoonchainウォレット体験を最適化する",
+    "background_fetch_notice_text": "Moonchainウォレットの最高性能を確保するために、アプリをバックグラウンドでアクティブに保ち、バッテリー最適化設定から除外することをお勧めします。これにより、ウォレットへのアクセスが途切れることなく、機能がスムーズに維持されます。",
     "acknowledge": "認める",
     "background_notifications_service_launched_successfully": "バックグラウンド通知サービスが正常に開始されました。",
     "unable_to_launch_background_notification_service": "バックグラウンド通知サービースを起動できません。",
@@ -351,7 +351,7 @@
     "auto_claim_execution_dialog_text": "オートクレームの時間が経過しました。今すぐオートクレームを実行しますか？",
     "execute": "実行する",
     "auto_claim_scheduling_text": "オートクレームは明日の{0}に実行されます。",
-    "wifi_location_background_fetch_notice_text": "AXSウォレットの最高性能を確保するために、アプリをバックグラウンドでアクティブに保ち、バッテリー最適化設定から除外することをお勧めします。これにより、ウォレットへのアクセスが途切れることなく、機能がスムーズに維持されます。WiFiヘキサゴンロケーションフックだけがバックグラウンドで位置情報サービスを使用し、アプリ内の他のサービスはアプリがバックグラウンドで動作している間、あなたの位置情報にアクセスしないことに注意してください。",
+    "wifi_location_background_fetch_notice_text": "Moonchainウォレットの最高性能を確保するために、アプリをバックグラウンドでアクティブに保ち、バッテリー最適化設定から除外することをお勧めします。これにより、ウォレットへのアクセスが途切れることなく、機能がスムーズに維持されます。WiFiヘキサゴンロケーションフックだけがバックグラウンドで位置情報サービスを使用し、アプリ内の他のサービスはアプリがバックグラウンドで動作している間、あなたの位置情報にアクセスしないことに注意してください。",
     "wifi_hexagon_location_hooks": "Wi-Fi六角形の位置フック",
     "mxc_top_up_notification_text": "ヘイ、{0}！あなたは今日、ウォレットに{1} MXCを追加しましたね。増やし続けてください！",
     "mxc_top_up_notification_title": "新たなトップアップおめでとうございます",
@@ -379,16 +379,16 @@
     "wifi_info_notifications_title": "成功したWi-Fiトランザクションの更新",
     "wifi_info_notifications_text": "あなたはMXC zkEVMにトランザクションを提出することで、Wi-Fiネットワークのリストを成功裏に更新しました。",
     "wifi_info_tx_failed": "おっと、Wi-Fiトランザクションの更新に失敗しました！",
-    "axs_background_location_service_text": "AXSウォレットのバックグラウンド位置情報サービスがWi-Fiフックで動作しています... .",
-    "axs_background_location_service_title": "AXSウォレットの位置情報サービス",
+    "moonchain_background_location_service_text": "Moonchainウォレットのバックグラウンド位置情報サービスがWi-Fiフックで動作しています... .",
+    "moonchain_background_location_service_title": "Moonchainウォレットの位置情報サービス",
     "unable_to_retrieve_wifi_info_successfully": "Wifi情報の取得に成功できませんでした！",
     "auto_claim_started": "自動請求が開始されました 🏁",
     "no_miners_selected_notification_title": "あなたはまだマイナーを選択していないようです。ℹ️",
     "no_miners_selected_notification_text": "マイナーDAppに移動して、マイナーを選択してください。",
     "auto_claim_successful_notification_title": "マイナー自動請求成功 ✅",
-    "auto_claim_successful_notification_text": "AXSウォレットが成功裏に請求され、あなたがマイニングしたトークンがあります。",
+    "auto_claim_successful_notification_text": "Moonchainウォレットが成功裏に請求され、あなたがマイニングしたトークンがあります。",
     "nothing_to_claim_notification_title": "おっと、請求するものが何もありません ℹ️",
-    "nothing_to_claim_notification_text": "AXSウォレットはあなたがマイニングしたトークンを請求しようとしましたが、請求するトークンが見つかりませんでした。",
+    "nothing_to_claim_notification_text": "Moonchainウォレットはあなたがマイニングしたトークンを請求しようとしましたが、請求するトークンが見つかりませんでした。",
     "auto_claim_failed": "マイナーの自動請求が失敗しました ❌",
     "no_miners_owned_notification": "このウォレットはマイナーを所有していないようです。ℹ️",
     "mining_tokens_from_miner": "マイナー#{0}からのトークンのマイニング。⛏️",
@@ -396,9 +396,9 @@
     "tokens_mined_successfully_miner": "マイナー #{0}：トークンの採掘に成功しました。✅",
     "token_mining_failed": "マイナー #{0}：トークンのマイニングプロセスに失敗しました。❌",
     "merkle_proof_error": "Merkle証明を検証しようとする際のエラー。",
-    "axs_location_permission_use_case": "AXSウォレットは、アプリが使用中またはバックグラウンドで実行されている間にWi-Fiフックなどの機能に対して、あなたの位置情報へのアクセスを必要とします。あなたの位置データは保存されず、また第三者と共有されません。",
-    "axs_camera_permission_use_case": "AXSウォレットは、RWAミンティングなどのサービスでアプリが使用中のときにカメラへのアクセスが必要です。画像データは保存されず、第三者とも共有されません。",
-    "axs_photos_permission_use_case": "AXSウォレットは、RWAのような画像を保存するためにあなたの写真へのアクセスが必要です。あなたの写真は第三者と共有または保存されません。",
+    "moonchain_location_permission_use_case": "Moonchainウォレットは、アプリが使用中またはバックグラウンドで実行されている間にWi-Fiフックなどの機能に対して、あなたの位置情報へのアクセスを必要とします。あなたの位置データは保存されず、また第三者と共有されません。",
+    "moonchain_camera_permission_use_case": "Moonchainウォレットは、RWAミンティングなどのサービスでアプリが使用中のときにカメラへのアクセスが必要です。画像データは保存されず、第三者とも共有されません。",
+    "moonchain_photos_permission_use_case": "Moonchainウォレットは、RWAのような画像を保存するためにあなたの写真へのアクセスが必要です。あなたの写真は第三者と共有または保存されません。",
     "permission_use_cases": "許可使用ケース",
     "ok_allow": "了解しました、許可します",
     "not_now": "今ではない",
@@ -416,7 +416,7 @@
     "local_secured_storage": "ローカルセキュアストレージ",
     "save_locally": "ローカルに保存する",
     "save_locally_description": "あなたのキーをローカルに保存してから、準備が整ったら始めてください。",
-    "axs_storage_permission_use_case": "AXSウォレットは、RWAのような機能のためにあなたのストレージへのアクセスが必要です。あなたのストレージデータは保存されず、また第三者と共有されません。",
+    "moonchain_storage_permission_use_case": "Moonchainウォレットは、RWAのような機能のためにあなたのストレージへのアクセスが必要です。あなたのストレージデータは保存されず、また第三者と共有されません。",
     "local_backup": "ローカルバックアップ",
     "no_description": "説明なし",
     "bluetooth_not_supported": "このデバイスではBluetoothはサポートされていません。",
@@ -443,9 +443,9 @@
     "no_rings_selected_notification_title": "あなたはまだブルーベリーリングを選んでいないようです。ℹ️",
     "no_rings_selected_notification_text": "リングの選択のために、ブルーベリーリングDAppに移動してください。",
     "auto_sync_successful_notification_title": "ブルーベリーリングの自動請求が成功しました✅",
-    "auto_sync_successful_notification_text": "AXSウォレットはあなたのリングデータを正常に同期しました。",
+    "auto_sync_successful_notification_text": "Moonchainウォレットはあなたのリングデータを正常に同期しました。",
     "already_synced_notification_title": "おっと、すでに同期済みℹ️",
-    "already_synced_notification_text": "AXSウォレットはあなたのリングデータを同期しようと試みましたが、今日すでにリングデータを同期しているようです。",
+    "already_synced_notification_text": "Moonchainウォレットはあなたのリングデータを同期しようと試みましたが、今日すでにリングデータを同期しているようです。",
     "auto_sync_failed": "ブルーベリーリングの自動同期が失敗しました❌",
     "no_rings_owned_notification": "このウォレットはブルーベリーリングを一つも所有していないようです。ℹ️",
     "syncing_data_from_ring": "ブルーベリーリング #{0} からのデータ同期中。⛏️",
@@ -453,5 +453,23 @@
     "data_synced_successfully_ring": "ブルーベリーリング #{0}: データは正常に同期されました。✅",
     "data_syncing_failed": "ブルーベリーリング #{0}: データ同期処理が失敗しました。❌",
     "blueberry_hooks": "ブルーベリーフック",
-    "message": "メッセージ"
+    "message": "メッセージ",
+    "moonchain_username": "ムーンチェーン ユーザー名",
+    "powered_by_moonchain_supernodes": "Moonchain スーパーノードによって提供されています",
+    "moonchain_design_documents": "ムーンチェーン設計ドキュメント",
+    "continue_now": "続ける",
+    "you_will_be_directed_to_the_main_app": "あなたはメインアプリに案内されます。",
+    "account_setup_complete": "アカウント設定完了！",
+    "entering_the_app": "アプリへの入力",
+    "in": "読み込み中…",
+    "google_drive_secured_storage": "Google Drive セキュリティで保護されたストレージ",
+    "icloud_secured_storage": "iCloud セキュリティで保護されたストレージ",
+    "make_sure_you_have_stored_your_keys_correctly_in_your_x": "キーを {0} に正しく保存したことを確認してください。",
+    "icloud": "iCloud",
+    "google_drive": "Google ドライブ",
+    "store_in_x": "{0} に保管する",
+    "your_email_address": "メールアドレス",
+    "invalid_email": "有効なメールアドレスを入力してください（例：name@example.com）",
+    "email": "電子メール",
+    "hello": "こんにちは"
 }
\ No newline at end of file
diff --git a/assets/flutter_i18n/ko.json b/assets/flutter_i18n/ko.json
index b94e64c0..de0127a6 100644
--- a/assets/flutter_i18n/ko.json
+++ b/assets/flutter_i18n/ko.json
@@ -10,11 +10,11 @@
     "confirm_passcode_desc": "비밀번호를 다시 입력하세요",
     "secret_recovery_phrase": "비밀 복구 구문",
     "import_your_wallet": "지갑 가져오기",
-    "word_seed_phrase": "간단히 기존의 지갑을 12, 18 또는 24 단어 복구 구문으로 가져오거나, 이메일 AXS 지갑 키 텍스트 파일을 다운로드하여 복구 구문을 여기에 붙여넣으십시오.",
+    "word_seed_phrase": "간단히 기존의 지갑을 12, 18 또는 24 단어 복구 구문으로 가져오거나, 이메일 Moonchain 지갑 키 텍스트 파일을 다운로드하여 복구 구문을 여기에 붙여넣으십시오.",
     "confirm": "확인",
     "choose_my_username": "사용자 이름 선택",
     "mnemonic_passphrase": "니모닉 문구",
-    "biometrics_setup": "AXS 생체 인식 설정",
+    "biometrics_setup": "Moonchain 생체 인식 설정",
     "mxc_zkevm_username": "MXC zkEVM 사용자 이름",
     "ens_announcement_description": "나만의 MXC zkEVM 사용자 이름을 사용하면 복잡한 지갑주소 대신 사용자 이름으로 암호화폐를 받을 수 있습니다.",
     "choose_your_username": "고유한 MXC zkEVM 사용자 이름을 선택하십시오",
@@ -41,12 +41,12 @@
     "send": "보내기",
     "received": "입금됨",
     "sent": "전송됨",
-    "email_secured_body": "당신의 AXS 지갑의 보안과 개인 정보 보호를 위해 이 이메일에 포함된 모든 정보를 철저히 비밀로 유지하는 것이 중요합니다.\n다음 단계를 주의 깊게 따라주세요:\n1. 이 이메일의 유일한 수신자가 당신임을 확인하기 위해 수신자의 주소를 당신의 주소로 바꿉니다.\n2. 올바른 이메일 주소를 확인한 후, '보내기' 버튼을 클릭하여 이 중요한 정보를 안전하게 자신에게 전달하세요. 이러한 조치를 준수함으로써 당신의 AXS 지갑의 최고의 안전성을 보장할 수 있습니다. 이 문제에 대한 당신의 성실함에 감사드립니다.",
-    "email_secured_subject": "AXS 지갑 키를 보호하세요 - 중요한 지침",
+    "email_secured_body": "당신의 Moonchain 지갑의 보안과 개인 정보 보호를 위해 이 이메일에 포함된 모든 정보를 철저히 비밀로 유지하는 것이 중요합니다.\n다음 단계를 주의 깊게 따라주세요:\n1. 이 이메일의 유일한 수신자가 당신임을 확인하기 위해 수신자의 주소를 당신의 주소로 바꿉니다.\n2. 올바른 이메일 주소를 확인한 후, '보내기' 버튼을 클릭하여 이 중요한 정보를 안전하게 자신에게 전달하세요. 이러한 조치를 준수함으로써 당신의 Moonchain 지갑의 최고의 안전성을 보장할 수 있습니다. 이 문제에 대한 당신의 성실함에 감사드립니다.",
+    "email_secured_subject": "Moonchain 지갑 키를 보호하세요 - 중요한 지침",
     "face_id": "얼굴 ID",
     "fingerprint": "지문",
     "touch_id": "터치 ID",
-    "unlock_axs_wallet": "AXS 지갑을 잠금 해제하십시오",
+    "unlock_moonchain_wallet": "Moonchain 지갑을 잠금 해제하십시오",
     "enter_your_passcode": "비밀번호를 입력하세요",
     "attempts_x": "6번의 시도 중 {0} 번",
     "forgot_passcode": "비밀번호 분실",
@@ -217,8 +217,8 @@
     "networks": "네트워크",
     "added": "추가됨",
     "want_to_add_this_network": "이 네트워크를 추가하시겠습니까?",
-    "network_adding_usage_notice": "이 네트워크를 추가하면 AXS 내에서 사용할 수 있게 됩니다.",
-    "custom_network_security_alert": "AXS는 사용자 정의 네트워크나 그들의 보안을 보증하지 않습니다.",
+    "network_adding_usage_notice": "이 네트워크를 추가하면 Moonchain 내에서 사용할 수 있게 됩니다.",
+    "custom_network_security_alert": "Moonchain는 사용자 정의 네트워크나 그들의 보안을 보증하지 않습니다.",
     "block_explorer_url": "블록 탐색기 URL",
     "new_network_added": "새로운 네트워크 추가됨",
     "x_is_now_available": "\"{0}\"이(가) 이제 네트워크 선택기에서 사용 가능합니다.",
@@ -242,7 +242,7 @@
     "confirm_delete_wallet": "지갑을 초기화하시겠습니까?",
     "confirm_delete_wallet_note": "이 작업은 되돌릴 수 없는 점을 유의해 주세요. 한번 지갑이 초기화되면, 모든 저장된 데이터, 결제 방법, 거래 내역, 그리고 모든 디지털 화폐(해당되는 경우)가 영구적으로 삭제됩니다.\n\n아직 지갑을 백업하지 않았다면, 중요한 정보나 자산을 잃지 않도록 지금 바로 백업하는 것을 강력히 권장합니다.",
     "understand_delete": "알겠습니다, 초기화",
-    "delete_wallet_warning": "\"예\"를 입력하여 현재 지갑을 초기화하세요.",
+    "delete_wallet_warning": "\"yes\"를 입력하여 현재 지갑을 초기화하세요.",
     "type_yes": "\"yes\"를 입력하세요",
     "clear_browser_successfully": "성공적으로 기록과 쿠키를 삭제했습니다",
     "exported_logs_successfully": "로그 성공적으로 내보냄",
@@ -288,11 +288,11 @@
     "send_&_receive": "보내기 & 받기",
     "contract": "계약",
     "decimals": "소수점",
-    "add_token_success_message": "만세! 토큰이 성공적으로 귀하의 AXS 지갑에 추가되었습니다! 🎉",
+    "add_token_success_message": "만세! 토큰이 성공적으로 귀하의 Moonchain 지갑에 추가되었습니다! 🎉",
     "import_account": "계정 가져오기",
     "add_account": "계정 추가",
     "private_key": "개인 키",
-    "import_notice": "가져온 계정은 귀하의 AXS 지갑 비밀 복구 구문과 연결되지 않을 것입니다.",
+    "import_notice": "가져온 계정은 귀하의 Moonchain 지갑 비밀 복구 구문과 연결되지 않을 것입니다.",
     "imported": "수입된",
     "view_private_key": "개인 키 보기",
     "view_private_key_notice": "경고: 이 키를 절대 공개하지 마십시오. 당신의 개인 키를 가진 사람은 계정에 보유한 모든 자산을 도난당할 수 있습니다.",
@@ -302,8 +302,8 @@
     "duplicate_account_import_notice": "당신이 가져오려고 하는 계정은 중복된 계정입니다.",
     "unable_to_launch_email_app": "이메일 앱을 실행할 수 없습니다.",
     "max_fee": "최대 수수료",
-    "deposit_from_exchanges_notice": "{0}에서 구매하고, {1} 거래소에서 zkEVM MXC를 직접 AXS 지갑에 입금하세요.",
-    "deposit_with_l3_bridge_notice": "다른 거래소에서 구매하고 {0}을 사용하여 ERC20 MXC를 AXS 지갑에 입금하십시오.",
+    "deposit_from_exchanges_notice": "{0}에서 구매하고, {1} 거래소에서 zkEVM MXC를 직접 Moonchain 지갑에 입금하세요.",
+    "deposit_with_l3_bridge_notice": "다른 거래소에서 구매하고 {0}을 사용하여 ERC20 MXC를 Moonchain 지갑에 입금하십시오.",
     "buy_some_x_for_fee_notice": "거래 수수료를 위해 {0}을 구매하세요, 네트워크가 바쁘지 않을 때는 일반적으로 2 달러 미만입니다.",
     "insufficient_funds_notice": "이 거래를 위한 잔액이 부족합니다. 자금을 추가해 주세요.",
     "contractCall": "계약 호출",
@@ -322,8 +322,8 @@
     "gas_fee_replacement_notice": "이 가스 비용은 원래의 것을 대체할 것입니다.",
     "unknown": "미확인",
     "transaction_finalized": "거래 완료",
-    "background_fetch_notice_title": "당신의 AXS 지갑 경험을 최적화하세요",
-    "background_fetch_notice_text": "AXS 지갑의 최적 성능을 보장하기 위해, 앱을 백그라운드에서 활성 상태로 유지하고 배터리 최적화 설정에서 제외하는 것을 권장합니다. 이는 원활한 기능성을 유지하고 지갑에 대한 끊임없는 접근을 돕습니다.",
+    "background_fetch_notice_title": "당신의 Moonchain 지갑 경험을 최적화하세요",
+    "background_fetch_notice_text": "Moonchain 지갑의 최적 성능을 보장하기 위해, 앱을 백그라운드에서 활성 상태로 유지하고 배터리 최적화 설정에서 제외하는 것을 권장합니다. 이는 원활한 기능성을 유지하고 지갑에 대한 끊임없는 접근을 돕습니다.",
     "acknowledge": "인정하다",
     "background_notifications_service_launched_successfully": "백그라운드 알림 서비스가 성공적으로 시작되었습니다.",
     "unable_to_launch_background_notification_service": "백그라운드 알림 서비스를 시작할 수 없습니다.",
@@ -351,7 +351,7 @@
     "auto_claim_execution_dialog_text": "자동 클레임 시간이 경과하였습니다. 지금 자동 클레임을 실행하시겠습니까?",
     "execute": "실행하다",
     "auto_claim_scheduling_text": "자동-청구는 내일 {0}에 실행됩니다.",
-    "wifi_location_background_fetch_notice_text": "AXS 지갑의 최적 성능을 보장하기 위해, 앱을 백그라운드에서 활성 상태로 유지하고 배터리 최적화 설정에서 제외하는 것을 권장합니다. 이는 원활한 기능성을 유지하고 지갑에 대한 끊김 없는 접근을 돕습니다. WiFi 헥사곤 위치 후크만이 백그라운드에서 위치 서비스를 사용할 것이며, 앱 내의 다른 서비스들은 앱이 백그라운드에서 실행되는 동안 귀하의 위치에 접근하지 않을 것임을 유의해 주십시오.",
+    "wifi_location_background_fetch_notice_text": "Moonchain 지갑의 최적 성능을 보장하기 위해, 앱을 백그라운드에서 활성 상태로 유지하고 배터리 최적화 설정에서 제외하는 것을 권장합니다. 이는 원활한 기능성을 유지하고 지갑에 대한 끊김 없는 접근을 돕습니다. WiFi 헥사곤 위치 후크만이 백그라운드에서 위치 서비스를 사용할 것이며, 앱 내의 다른 서비스들은 앱이 백그라운드에서 실행되는 동안 귀하의 위치에 접근하지 않을 것임을 유의해 주십시오.",
     "wifi_hexagon_location_hooks": "Wi-Fi 육각형 위치 후크",
     "mxc_top_up_notification_text": "안녕하세요 {0}님! 오늘 당신의 지갑에 {1} MXC를 추가하셨네요. 계속 성장시켜 보세요!",
     "mxc_top_up_notification_title": "새로운 충전을 축하합니다",
@@ -379,16 +379,16 @@
     "wifi_info_notifications_title": "성공적인 Wi-Fi 거래 업데이트",
     "wifi_info_notifications_text": "당신은 MXC zkEVM에 트랜잭션을 제출함으로써 Wi-Fi 네트워크 목록을 성공적으로 업데이트했습니다.",
     "wifi_info_tx_failed": "이런, Wi-Fi 거래 업데이트가 실패했습니다!",
-    "axs_background_location_service_text": "Wi-Fi 후크를 위한 AXS 지갑 배경 위치 서비스가 실행 중입니다... .",
-    "axs_background_location_service_title": "AXS 지갑 위치 서비스",
+    "moonchain_background_location_service_text": "Wi-Fi 후크를 위한 Moonchain 지갑 배경 위치 서비스가 실행 중입니다... .",
+    "moonchain_background_location_service_title": "Moonchain 지갑 위치 서비스",
     "unable_to_retrieve_wifi_info_successfully": "Wifi 정보를 성공적으로 검색할 수 없습니다!",
     "auto_claim_started": "자동 클레임 시작 🏁",
     "no_miners_selected_notification_title": "보아하니 당신은 아직 채굴자를 선택하지 않으셨네요. ℹ️",
     "no_miners_selected_notification_text": "다음의 광부를 선택하기 위해 miner DApp으로 이동해 주세요.",
     "auto_claim_successful_notification_title": "채굴자 자동-청구 성공 ✅",
-    "auto_claim_successful_notification_text": "다음의 영어 텍스트를 한국어로 번역하면: AXS 지갑이 성공적으로 채굴된 토큰을 주장했습니다.",
+    "auto_claim_successful_notification_text": "다음의 영어 텍스트를 한국어로 번역하면: Moonchain 지갑이 성공적으로 채굴된 토큰을 주장했습니다.",
     "nothing_to_claim_notification_title": "이런, 청구할 것이 없습니다 ℹ️",
-    "nothing_to_claim_notification_text": "AXS 지갑이 귀하의 채굴된 토큰을 청구하려고 시도했지만, 청구할 토큰을 찾지 못했습니다.",
+    "nothing_to_claim_notification_text": "Moonchain 지갑이 귀하의 채굴된 토큰을 청구하려고 시도했지만, 청구할 토큰을 찾지 못했습니다.",
     "auto_claim_failed": "채굴자 자동-청구 실패 ❌",
     "no_miners_owned_notification": "이 지갑은 채굴자를 소유하고 있지 않은 것 같습니다. ℹ️",
     "mining_tokens_from_miner": "채굴자 #{0}로부터 토큰 채굴하기. ⛏️",
@@ -396,9 +396,9 @@
     "tokens_mined_successfully_miner": "채굴자 #{0}: 토큰이 성공적으로 채굴되었습니다. ✅",
     "token_mining_failed": "채굴자 #{0}: 토큰 채굴 과정이 실패했습니다. ❌",
     "merkle_proof_error": "Merkle 증명을 검증하려는 도중 오류가 발생했습니다.",
-    "axs_location_permission_use_case": "AXS Wallet은 앱이 사용 중이거나 백그라운드에서 실행되는 동안 Wi-Fi 후크와 같은 기능을 위해 귀하의 위치에 대한 접근 권한이 필요합니다. 귀하의 위치 데이터는 저장되거나 제3자와 공유되지 않습니다.",
-    "axs_camera_permission_use_case": "AXS 지갑은 RWA 코인 생성과 같은 서비스를 위해 앱이 사용 중일 때 카메라에 대한 접근 권한이 필요합니다. 이미지 데이터는 저장되거나 제3자와 공유되지 않습니다.",
-    "axs_photos_permission_use_case": "AXS 지갑은 RWA와 같은 이미지를 저장하기 위해 귀하의 사진에 접근할 필요가 있습니다. 귀하의 사진은 어떠한 제3자와도 저장되거나 공유되지 않습니다.",
+    "moonchain_location_permission_use_case": "Moonchain Wallet은 앱이 사용 중이거나 백그라운드에서 실행되는 동안 Wi-Fi 후크와 같은 기능을 위해 귀하의 위치에 대한 접근 권한이 필요합니다. 귀하의 위치 데이터는 저장되거나 제3자와 공유되지 않습니다.",
+    "moonchain_camera_permission_use_case": "Moonchain 지갑은 RWA 코인 생성과 같은 서비스를 위해 앱이 사용 중일 때 카메라에 대한 접근 권한이 필요합니다. 이미지 데이터는 저장되거나 제3자와 공유되지 않습니다.",
+    "moonchain_photos_permission_use_case": "Moonchain 지갑은 RWA와 같은 이미지를 저장하기 위해 귀하의 사진에 접근할 필요가 있습니다. 귀하의 사진은 어떠한 제3자와도 저장되거나 공유되지 않습니다.",
     "permission_use_cases": "사용 권한 사용 사례",
     "ok_allow": "좋아요, 허용",
     "not_now": "지금 아니야",
@@ -416,7 +416,7 @@
     "local_secured_storage": "지역 보안 저장소",
     "save_locally": "로컬에 저장",
     "save_locally_description": "당신의 키를 로컬에 저장하십시오, 그런 다음 시작하면 됩니다.",
-    "axs_storage_permission_use_case": "AXS 지갑은 RWA와 같은 기능을 위해 당신의 저장 공간에 접근할 필요가 있습니다. 당신의 저장 데이터는 어떠한 제3자와도 저장되거나 공유되지 않습니다.",
+    "moonchain_storage_permission_use_case": "Moonchain 지갑은 RWA와 같은 기능을 위해 당신의 저장 공간에 접근할 필요가 있습니다. 당신의 저장 데이터는 어떠한 제3자와도 저장되거나 공유되지 않습니다.",
     "local_backup": "로컬 백업",
     "no_description": "설명 없음",
     "bluetooth_not_supported": "이 장치는 블루투스를 지원하지 않습니다.",
@@ -443,9 +443,9 @@
     "no_rings_selected_notification_title": "보아하니 당신은 어떠한 블루베리 링도 선택하지 않은 것 같습니다. ℹ️",
     "no_rings_selected_notification_text": "다음의 반지를 선택하기 위해 Blueberry Ring DApp으로 이동해 주세요.",
     "auto_sync_successful_notification_title": "블루베리 링 자동-클레임 성공 ✅",
-    "auto_sync_successful_notification_text": "다음의 영어 텍스트를 한국어로 번역하면: AXS 지갑이 성공적으로 당신의 링 데이터를 동기화했습니다.",
+    "auto_sync_successful_notification_text": "다음의 영어 텍스트를 한국어로 번역하면: Moonchain 지갑이 성공적으로 당신의 링 데이터를 동기화했습니다.",
     "already_synced_notification_title": "이런, 이미 동기화되었습니다 ℹ️",
-    "already_synced_notification_text": "AXS 지갑이 귀하의 링 데이터를 동기화하려고 시도했지만, 오늘 이미 링 데이터를 동기화한 것 같습니다.",
+    "already_synced_notification_text": "Moonchain 지갑이 귀하의 링 데이터를 동기화하려고 시도했지만, 오늘 이미 링 데이터를 동기화한 것 같습니다.",
     "auto_sync_failed": "블루베리 링 자동 동기화 실패 ❌",
     "no_rings_owned_notification": "이 지갑은 블루베리 링을 소유하고 있지 않은 것 같습니다. ℹ️",
     "syncing_data_from_ring": "블루베리 링 #{0}에서 데이터 동기화 중. ⛏️",
@@ -453,5 +453,23 @@
     "data_synced_successfully_ring": "블루베리 링 #{0}: 데이터 동기화 성공적으로 완료. ✅",
     "data_syncing_failed": "블루베리 링 #{0}: 데이터 동기화 과정이 실패했습니다. ❌",
     "blueberry_hooks": "블루베리 훅스",
-    "message": "메시지"
+    "message": "메시지",
+    "moonchain_username": "문체인 사용자 이름",
+    "powered_by_moonchain_supernodes": "문체인 슈퍼노드 지원",
+    "moonchain_design_documents": "문체인 설계 문서",
+    "continue_now": "지금 계속하기",
+    "you_will_be_directed_to_the_main_app": "주 앱으로 안내됩니다.",
+    "account_setup_complete": "계정 설정 완료!",
+    "entering_the_app": "앱에 들어가기",
+    "in": "로드 중..",
+    "google_drive_secured_storage": "구글 드라이브 보안 저장소",
+    "icloud_secured_storage": "iCloud 보안 저장소",
+    "make_sure_you_have_stored_your_keys_correctly_in_your_x": "키를 {0}에 올바르게 저장했는지 확인하세요.",
+    "icloud": "iCloud",
+    "google_drive": "구글 드라이브",
+    "store_in_x": "{0}에 저장",
+    "your_email_address": "이메일 주소",
+    "invalid_email": "유효한 이메일 주소를 입력해 주세요(예: name@example.com)",
+    "email": "이메일",
+    "hello": "안녕하세요"
 }
\ No newline at end of file
diff --git a/assets/flutter_i18n/nl.json b/assets/flutter_i18n/nl.json
index ee0b0e12..d124435a 100644
--- a/assets/flutter_i18n/nl.json
+++ b/assets/flutter_i18n/nl.json
@@ -10,11 +10,11 @@
     "confirm_passcode_desc": "Voer uw toegangscode opnieuw in",
     "secret_recovery_phrase": "Geheime herstelzin",
     "import_your_wallet": "Importeer Je Wallet",
-    "word_seed_phrase": "Importeer eenvoudig uw bestaande portemonnee met uw herstelzin van 12, 18 of 24 woorden, of download het AXS-portemonneesleutel tekstbestand uit de e-mail en plak de herstelzin hier.",
+    "word_seed_phrase": "Importeer eenvoudig uw bestaande portemonnee met uw herstelzin van 12, 18 of 24 woorden, of download het Moonchain-portemonneesleutel tekstbestand uit de e-mail en plak de herstelzin hier.",
     "confirm": "Bevestigen",
     "choose_my_username": "Kies mijn gebruikersnaam",
     "mnemonic_passphrase": "Mnemonisch Wachtwoord",
-    "biometrics_setup": "AXS Biometrische Instellingen",
+    "biometrics_setup": "Moonchain Biometrische Instellingen",
     "mxc_zkevm_username": "MXC zkEVM Gebruikersnaam",
     "ens_announcement_description": "Met uw unieke MXC zkEVM gebruikersnaam, wordt de omslachtige procedure van het omgaan met complexe wallet-adressen verleden tijd. Nu kunt u moeiteloos een aangepaste en exclusieve naam gebruiken die u onderscheidt",
     "choose_your_username": "Kies je unieke MXC zkEVM gebruikersnaam",
@@ -41,12 +41,12 @@
     "send": "Verstuur",
     "received": "Ontvangen",
     "sent": "Verzonden",
-    "email_secured_body": "Voor de veiligheid en privacy van uw AXS-Wallet is het essentieel dat u alle informatie in deze e-mail strikt vertrouwelijk houdt. \nVolg deze volgende stappen zorgvuldig: \n1. Zorg ervoor dat u de enige ontvanger van deze e-mail bent door het adres van de ontvanger te vervangen door uw eigen adres. \n2. Nadat u het juiste e-mailadres heeft bevestigd, klikt u op de knop 'Verzenden' om deze cruciale informatie veilig naar uzelf door te sturen. Door deze maatregelen na te leven, zorgt u voor de grootst mogelijke veiligheid voor uw AXS-Wallet. Bedankt voor uw zorgvuldigheid in deze kwestie.",
-    "email_secured_subject": "Beveilig uw AXS Wallet Sleutel - Belangrijke Instructies",
+    "email_secured_body": "Voor de veiligheid en privacy van uw Moonchain-Wallet is het essentieel dat u alle informatie in deze e-mail strikt vertrouwelijk houdt. \nVolg deze volgende stappen zorgvuldig: \n1. Zorg ervoor dat u de enige ontvanger van deze e-mail bent door het adres van de ontvanger te vervangen door uw eigen adres. \n2. Nadat u het juiste e-mailadres heeft bevestigd, klikt u op de knop 'Verzenden' om deze cruciale informatie veilig naar uzelf door te sturen. Door deze maatregelen na te leven, zorgt u voor de grootst mogelijke veiligheid voor uw Moonchain-Wallet. Bedankt voor uw zorgvuldigheid in deze kwestie.",
+    "email_secured_subject": "Beveilig uw Moonchain Wallet Sleutel - Belangrijke Instructies",
     "face_id": "Gezichts-ID",
     "fingerprint": "Vingerafdruk",
     "touch_id": "Touch ID",
-    "unlock_axs_wallet": "Ontgrendel je AXS Wallet",
+    "unlock_moonchain_wallet": "Ontgrendel je Moonchain Wallet",
     "enter_your_passcode": "Voer je toegangscode in",
     "attempts_x": "{0} van de 6 pogingen",
     "forgot_passcode": "Ik ben mijn toegangscode vergeten",
@@ -217,8 +217,8 @@
     "networks": "Netwerken",
     "added": "Toegevoegd",
     "want_to_add_this_network": "Wil je dit netwerk toevoegen?",
-    "network_adding_usage_notice": "Het toevoegen van dit netwerk maakt het mogelijk om het binnen AXS te gebruiken.",
-    "custom_network_security_alert": "AXS onderschrijft geen aangepaste netwerken of hun beveiliging.",
+    "network_adding_usage_notice": "Het toevoegen van dit netwerk maakt het mogelijk om het binnen Moonchain te gebruiken.",
+    "custom_network_security_alert": "Moonchain onderschrijft geen aangepaste netwerken of hun beveiliging.",
     "block_explorer_url": "Block explorer url",
     "new_network_added": "Nieuw netwerk toegevoegd",
     "x_is_now_available": "\"{0}\" is nu beschikbaar in de netwerkselector.",
@@ -242,7 +242,7 @@
     "confirm_delete_wallet": "Weet u zeker dat u uw wallet wilt resetten?",
     "confirm_delete_wallet_note": "Wees u ervan bewust dat deze actie onomkeerbaar is. Zodra uw wallet is gereset, worden alle opgeslagen gegevens, inclusief uw betaalmethoden, transactiegeschiedenis en eventuele digitale valuta's (indien van toepassing) permanent verwijderd.\n\nAls u uw wallet nog niet heeft geback-upt, raden we u ten zeerste aan dit nu te doen om ervoor te zorgen dat u geen essentiële informatie of activa verliest.",
     "understand_delete": "Ik begrijp het, reset",
-    "delete_wallet_warning": "Typ \"ja\" om je huidige wallet te resetten.",
+    "delete_wallet_warning": "Typ \"yes\" om je huidige wallet te resetten.",
     "type_yes": "Typ \"yes\"",
     "clear_browser_successfully": "Geschiedenis en cookies succesvol gewist",
     "exported_logs_successfully": "Logs succesvol geëxporteerd",
@@ -288,11 +288,11 @@
     "send_&_receive": "Versturen & Ontvangen",
     "contract": "Contract",
     "decimals": "Decimalen",
-    "add_token_success_message": "Hoera! De token is succesvol toegevoegd aan je AXS portemonnee! 🎉",
+    "add_token_success_message": "Hoera! De token is succesvol toegevoegd aan je Moonchain portemonnee! 🎉",
     "import_account": "Account importeren",
     "add_account": "Voeg account toe",
     "private_key": "Prive sleutel",
-    "import_notice": "Geïmporteerde accounts zullen niet worden geassocieerd met uw AXS wallet Geheime Herstelzin.",
+    "import_notice": "Geïmporteerde accounts zullen niet worden geassocieerd met uw Moonchain wallet Geheime Herstelzin.",
     "imported": "Geïmporteerd",
     "view_private_key": "Bekijk privésleutel",
     "view_private_key_notice": "Waarschuwing: Geef deze sleutel nooit vrij. Iedereen met uw privésleutels kan alle activa die op uw account staan stelen.",
@@ -302,8 +302,8 @@
     "duplicate_account_import_notice": "Het account dat u probeert te importeren is een duplicaat.",
     "unable_to_launch_email_app": "Kan e-mail app niet starten",
     "max_fee": "Maximale Vergoeding",
-    "deposit_from_exchanges_notice": "Koop van {0}, {1} beurzen en stort zkEVM MXC direct in de AXS portemonnee",
-    "deposit_with_l3_bridge_notice": "Koop van andere beurzen en gebruik {0} om ERC20 MXC te storten in de AXS portemonnee",
+    "deposit_from_exchanges_notice": "Koop van {0}, {1} beurzen en stort zkEVM MXC direct in de Moonchain portemonnee",
+    "deposit_with_l3_bridge_notice": "Koop van andere beurzen en gebruik {0} om ERC20 MXC te storten in de Moonchain portemonnee",
     "buy_some_x_for_fee_notice": "Koop wat {0} om de gasprijs voor de transactie te betalen, normaal gesproken minder dan 2 USD wanneer het netwerk niet druk is.",
     "insufficient_funds_notice": "Onvoldoende saldo voor deze transactie. Voeg alsjeblieft fondsen toe.",
     "contractCall": "Contractoproep",
@@ -322,8 +322,8 @@
     "gas_fee_replacement_notice": "Deze gasvergoeding zal de originele vervangen.",
     "unknown": "Onbekend",
     "transaction_finalized": "Transactie Afgerond",
-    "background_fetch_notice_title": "Optimaliseer uw AXS Wallet Ervaring",
-    "background_fetch_notice_text": "Om de topprestaties van de AXS Wallet te garanderen, raden we aan om de app actief op de achtergrond te houden en deze uit te sluiten van batterijoptimalisatie-instellingen. Dit helpt om een naadloze functionaliteit en ononderbroken toegang tot uw portemonnee te behouden.",
+    "background_fetch_notice_title": "Optimaliseer uw Moonchain Wallet Ervaring",
+    "background_fetch_notice_text": "Om de topprestaties van de Moonchain Wallet te garanderen, raden we aan om de app actief op de achtergrond te houden en deze uit te sluiten van batterijoptimalisatie-instellingen. Dit helpt om een naadloze functionaliteit en ononderbroken toegang tot uw portemonnee te behouden.",
     "acknowledge": "Erken",
     "background_notifications_service_launched_successfully": "Achtergrondmeldingen service succesvol gelanceerd.",
     "unable_to_launch_background_notification_service": "Kan achtergrondmeldingsservice niet starten.",
@@ -351,7 +351,7 @@
     "auto_claim_execution_dialog_text": "De tijd voor automatische claim is verstreken. Wilt u nu een automatische claim uitvoeren?",
     "execute": "Uitvoeren",
     "auto_claim_scheduling_text": "Auto-claim wordt morgen om {0} uitgevoerd",
-    "wifi_location_background_fetch_notice_text": "Om de topprestaties van de AXS Wallet te garanderen, raden we aan om de app actief op de achtergrond te houden en deze uit te sluiten van batterijoptimalisatie-instellingen. Dit helpt bij het behouden van naadloze functionaliteit en ononderbroken toegang tot uw portemonnee. Let op: alleen WiFi hexagon locatiehaken zullen locatiediensten gebruiken op de achtergrond; andere diensten binnen de app zullen uw locatie niet benaderen terwijl de app op de achtergrond draait.",
+    "wifi_location_background_fetch_notice_text": "Om de topprestaties van de Moonchain Wallet te garanderen, raden we aan om de app actief op de achtergrond te houden en deze uit te sluiten van batterijoptimalisatie-instellingen. Dit helpt bij het behouden van naadloze functionaliteit en ononderbroken toegang tot uw portemonnee. Let op: alleen WiFi hexagon locatiehaken zullen locatiediensten gebruiken op de achtergrond; andere diensten binnen de app zullen uw locatie niet benaderen terwijl de app op de achtergrond draait.",
     "wifi_hexagon_location_hooks": "Wi-Fi hexagon locatie haken",
     "mxc_top_up_notification_text": "Hé {0}! Je hebt vandaag {1} MXC aan je portemonnee toegevoegd. Blijf het laten groeien!",
     "mxc_top_up_notification_title": "Gefeliciteerd met je nieuwe opwaardering",
@@ -379,16 +379,16 @@
     "wifi_info_notifications_title": "Succesvolle Wi-Fi Transactie Update",
     "wifi_info_notifications_text": "U heeft met succes de lijst van Wi-Fi-netwerken bijgewerkt door een transactie in te dienen bij de MXC zkEVM.",
     "wifi_info_tx_failed": "Oeps, Wi-Fi Transactie Update is mislukt!",
-    "axs_background_location_service_text": "De achtergrondlocatieservice van de AXS-portemonnee voor Wi-Fi-aansluitingen is actief... .",
-    "axs_background_location_service_title": "Locatieservice voor AXS-portemonnee",
+    "moonchain_background_location_service_text": "De achtergrondlocatieservice van de Moonchain-portemonnee voor Wi-Fi-aansluitingen is actief... .",
+    "moonchain_background_location_service_title": "Locatieservice voor Moonchain-portemonnee",
     "unable_to_retrieve_wifi_info_successfully": "Kan wifi-informatie niet succesvol ophalen!",
     "auto_claim_started": "Auto Claim Gestart 🏁",
     "no_miners_selected_notification_title": "Het lijkt erop dat je nog geen miners hebt geselecteerd. ℹ️",
     "no_miners_selected_notification_text": "Ga alstublieft naar de miner DApp om miners te selecteren.",
     "auto_claim_successful_notification_title": "Mijnwerker auto-claim succesvol ✅",
-    "auto_claim_successful_notification_text": "De AXS-portemonnee is met succes geclaimd, je hebt tokens gemijnd.",
+    "auto_claim_successful_notification_text": "De Moonchain-portemonnee is met succes geclaimd, je hebt tokens gemijnd.",
     "nothing_to_claim_notification_title": "Oeps, niets te claimen ℹ️",
-    "nothing_to_claim_notification_text": "De AXS-portemonnee probeerde je gemijnde tokens te claimen, maar vond geen tokens om te claimen.",
+    "nothing_to_claim_notification_text": "De Moonchain-portemonnee probeerde je gemijnde tokens te claimen, maar vond geen tokens om te claimen.",
     "auto_claim_failed": "Mijnwerker auto-claim mislukt ❌",
     "no_miners_owned_notification": "Het lijkt erop dat deze portemonnee geen miners bezit. ℹ️",
     "mining_tokens_from_miner": "Tokens minen van Miner #{0}. ⛏️",
@@ -396,9 +396,9 @@
     "tokens_mined_successfully_miner": "Mijnwerker #{0}: Tokens succesvol gemijnd. ✅",
     "token_mining_failed": "Mijnwerker #{0}: Token mijnproces mislukt. ❌",
     "merkle_proof_error": "Fout tijdens het proberen te verifiëren van Merkle-bewijs.",
-    "axs_location_permission_use_case": "De AXS Wallet heeft toegang tot uw locatie nodig voor functies zoals Wi-Fi hooks terwijl de app in gebruik is of op de achtergrond draait. Uw locatiegegevens worden niet opgeslagen of gedeeld met derden.",
-    "axs_camera_permission_use_case": "De AXS Wallet heeft toegang nodig tot uw camera wanneer de app in gebruik is voor diensten zoals RWA minting. Beeldgegevens worden niet opgeslagen of gedeeld met derden.",
-    "axs_photos_permission_use_case": "De AXS Wallet heeft toegang tot uw foto's nodig om afbeeldingen zoals RWA op te slaan. Uw foto's worden niet opgeslagen of gedeeld met derden.",
+    "moonchain_location_permission_use_case": "De Moonchain Wallet heeft toegang tot uw locatie nodig voor functies zoals Wi-Fi hooks terwijl de app in gebruik is of op de achtergrond draait. Uw locatiegegevens worden niet opgeslagen of gedeeld met derden.",
+    "moonchain_camera_permission_use_case": "De Moonchain Wallet heeft toegang nodig tot uw camera wanneer de app in gebruik is voor diensten zoals RWA minting. Beeldgegevens worden niet opgeslagen of gedeeld met derden.",
+    "moonchain_photos_permission_use_case": "De Moonchain Wallet heeft toegang tot uw foto's nodig om afbeeldingen zoals RWA op te slaan. Uw foto's worden niet opgeslagen of gedeeld met derden.",
     "permission_use_cases": "Gebruikstoestemming use cases",
     "ok_allow": "OK, Toestaan",
     "not_now": "Niet nu",
@@ -416,7 +416,7 @@
     "local_secured_storage": "Lokaal beveiligde opslag",
     "save_locally": "Lokaal opslaan",
     "save_locally_description": "Zorg ervoor dat je je sleutels lokaal opslaat en dan ben je klaar om te gaan.",
-    "axs_storage_permission_use_case": "De AXS Wallet heeft toegang tot uw opslag nodig voor functies zoals RWA. Uw opslaggegevens worden niet opgeslagen of gedeeld met derden.",
+    "moonchain_storage_permission_use_case": "De Moonchain Wallet heeft toegang tot uw opslag nodig voor functies zoals RWA. Uw opslaggegevens worden niet opgeslagen of gedeeld met derden.",
     "local_backup": "Lokale back-up",
     "no_description": "Geen beschrijving",
     "bluetooth_not_supported": "Bluetooth wordt niet ondersteund op dit apparaat.",
@@ -443,9 +443,9 @@
     "no_rings_selected_notification_title": "Het lijkt erop dat je nog geen Blueberry Rings hebt geselecteerd. ℹ️",
     "no_rings_selected_notification_text": "Ga alstublieft naar Blueberry Ring DApp om ringen te selecteren.",
     "auto_sync_successful_notification_title": "Blueberry Ring aut-claim succesvol ✅",
-    "auto_sync_successful_notification_text": "Uw AXS-portemonnee heeft met succes uw ringgegevens gesynchroniseerd.",
+    "auto_sync_successful_notification_text": "Uw Moonchain-portemonnee heeft met succes uw ringgegevens gesynchroniseerd.",
     "already_synced_notification_title": "Oeps, al gesynchroniseerd ℹ️",
-    "already_synced_notification_text": "De AXS-portemonnee probeerde je ringgegevens te synchroniseren, maar het lijkt erop dat je de ringgegevens vandaag al hebt gesynchroniseerd.",
+    "already_synced_notification_text": "De Moonchain-portemonnee probeerde je ringgegevens te synchroniseren, maar het lijkt erop dat je de ringgegevens vandaag al hebt gesynchroniseerd.",
     "auto_sync_failed": "Blueberry Ring auto-sync mislukt ❌",
     "no_rings_owned_notification": "Het lijkt erop dat deze portemonnee geen Blueberry Rings bezit. ℹ️",
     "syncing_data_from_ring": "Gegevens synchroniseren van Blueberry Ring #{0}. ⛏️",
@@ -453,5 +453,23 @@
     "data_synced_successfully_ring": "Blueberry Ring #{0}: Gegevens succesvol gesynchroniseerd. ✅",
     "data_syncing_failed": "Blueberry Ring #{0}: Gegevens synchronisatieproces mislukt. ❌",
     "blueberry_hooks": "Blueberry haken",
-    "message": "Bericht"
+    "message": "Bericht",
+    "moonchain_username": "Maanchain Gebruikersnaam",
+    "powered_by_moonchain_supernodes": "Aangedreven door Moonchain Supernodes",
+    "moonchain_design_documents": "Maandocumenten ontwerp",
+    "continue_now": "Ga door",
+    "you_will_be_directed_to_the_main_app": "U wordt doorgestuurd naar de hoofdapp ",
+    "account_setup_complete": "Accountinstelling voltooid!",
+    "entering_the_app": "De app betreden",
+    "in": "Loading..",
+    "google_drive_secured_storage": "Google Drive beveiligde opslag",
+    "icloud_secured_storage": "iCloud-beveiligde opslag",
+    "make_sure_you_have_stored_your_keys_correctly_in_your_x": "Zorg ervoor dat u uw sleutels correct hebt opgeslagen in uw {0}",
+    "icloud": "iCloud",
+    "google_drive": "Google Drive",
+    "store_in_x": "Bewaar in {0}",
+    "your_email_address": "Uw e-mailadres",
+    "invalid_email": "Voer een geldig e-mailadres in (bijv. naam@voorbeeld.com)",
+    "email": "E-mail",
+    "hello": "Hallo"
 }
\ No newline at end of file
diff --git a/assets/flutter_i18n/pt.json b/assets/flutter_i18n/pt.json
index d7cebf1b..0bd8e96e 100644
--- a/assets/flutter_i18n/pt.json
+++ b/assets/flutter_i18n/pt.json
@@ -10,11 +10,11 @@
     "confirm_passcode_desc": "Digite novamente seu código de acesso",
     "secret_recovery_phrase": "Frase secreta de recuperação",
     "import_your_wallet": "Importe Sua Carteira",
-    "word_seed_phrase": "Basta importar sua carteira existente com sua frase de recuperação de 12, 18 ou 24 palavras, ou baixar do email o arquivo de texto da chave da carteira AXS e colar a frase de recuperação aqui.",
+    "word_seed_phrase": "Basta importar sua carteira existente com sua frase de recuperação de 12, 18 ou 24 palavras, ou baixar do email o arquivo de texto da chave da carteira Moonchain e colar a frase de recuperação aqui.",
     "confirm": "Confirmar",
     "choose_my_username": "Escolha meu nome de usuário",
     "mnemonic_passphrase": "Frase de Senha Mnemônica",
-    "biometrics_setup": "Configuração de Biometria AXS",
+    "biometrics_setup": "Configuração de Biometria Moonchain",
     "mxc_zkevm_username": "Nome de usuário MXC zkEVM",
     "ens_announcement_description": "Com o seu exclusivo nome de usuário MXC zkEVM, o processo complicado de lidar com endereços de carteira complexos se torna coisa do passado. Agora, você pode usar sem esforço um nome personalizado e exclusivo que te destaca.",
     "choose_your_username": "Escolha seu nome de usuário único MXC zkEVM",
@@ -41,12 +41,12 @@
     "send": "Enviar",
     "received": "Recebido",
     "sent": "Enviado",
-    "email_secured_body": "Pela segurança e privacidade da sua carteira AXS, é essencial que você mantenha todas as informações contidas neste email estritamente confidenciais.\nPor favor, siga os próximos passos com atenção:\n1. Certifique-se de que você é o único destinatário deste email, substituindo o endereço do destinatário pelo seu.\n2. Após confirmar o endereço de email correto, prossiga clicando no botão 'Enviar' para encaminhar estas informações vitais para você de forma segura. Ao aderir a estas medidas, você garantirá a máxima segurança para sua carteira AXS. Obrigado pela sua diligência neste assunto.",
-    "email_secured_subject": "Proteja Sua Chave da Carteira AXS - Instruções Importantes",
+    "email_secured_body": "Pela segurança e privacidade da sua carteira Moonchain, é essencial que você mantenha todas as informações contidas neste email estritamente confidenciais.\nPor favor, siga os próximos passos com atenção:\n1. Certifique-se de que você é o único destinatário deste email, substituindo o endereço do destinatário pelo seu.\n2. Após confirmar o endereço de email correto, prossiga clicando no botão 'Enviar' para encaminhar estas informações vitais para você de forma segura. Ao aderir a estas medidas, você garantirá a máxima segurança para sua carteira Moonchain. Obrigado pela sua diligência neste assunto.",
+    "email_secured_subject": "Proteja Sua Chave da Carteira Moonchain - Instruções Importantes",
     "face_id": "Reconhecimento Facial",
     "fingerprint": "Impressão Digital",
     "touch_id": "ID de Toque",
-    "unlock_axs_wallet": "Desbloqueie sua carteira AXS",
+    "unlock_moonchain_wallet": "Desbloqueie sua carteira Moonchain",
     "enter_your_passcode": "Insira seu código de acesso",
     "attempts_x": "{0} de 6 tentativas",
     "forgot_passcode": "Esqueci meu código de acesso",
@@ -217,8 +217,8 @@
     "networks": "Redes",
     "added": "Adicionado",
     "want_to_add_this_network": "Deseja adicionar esta rede?",
-    "network_adding_usage_notice": "Adicionar esta rede, permite que seja utilizada dentro do AXS",
-    "custom_network_security_alert": "AXS não endossa redes personalizadas ou sua segurança.",
+    "network_adding_usage_notice": "Adicionar esta rede, permite que seja utilizada dentro do Moonchain",
+    "custom_network_security_alert": "Moonchain não endossa redes personalizadas ou sua segurança.",
     "block_explorer_url": "URL do explorador de blocos",
     "new_network_added": "Nova rede adicionada",
     "x_is_now_available": "\"{0}\" agora está disponível no seletor de rede.",
@@ -242,7 +242,7 @@
     "confirm_delete_wallet": "Tem certeza de que deseja redefinir sua carteira?",
     "confirm_delete_wallet_note": "Por favor, esteja ciente de que esta ação é irreversível. Uma vez que sua carteira seja redefinida, todos os dados armazenados, incluindo seus métodos de pagamento, histórico de transações e quaisquer moedas digitais (se aplicável) serão removidos permanentemente.\n\nSe você não fez backup da sua carteira, recomendamos fortemente que faça agora para garantir que não perca nenhuma informação ou ativo vital.",
     "understand_delete": "Eu entendo, redefinir",
-    "delete_wallet_warning": "Digite \"sim\" para redefinir sua carteira atual",
+    "delete_wallet_warning": "Digite \"yes\" para redefinir sua carteira atual",
     "type_yes": "Digite \"yes\"",
     "clear_browser_successfully": "Histórico e cookies apagados com sucesso",
     "exported_logs_successfully": "Logs exportados com sucesso",
@@ -288,11 +288,11 @@
     "send_&_receive": "Enviar & Receber",
     "contract": "Contrato",
     "decimals": "Decimais",
-    "add_token_success_message": "Viva! O token foi adicionado com sucesso à sua carteira AXS! 🎉",
+    "add_token_success_message": "Viva! O token foi adicionado com sucesso à sua carteira Moonchain! 🎉",
     "import_account": "Importar conta",
     "add_account": "Adicionar conta",
     "private_key": "Chave privada",
-    "import_notice": "Contas importadas não serão associadas à sua Frase Secreta de Recuperação da carteira AXS.",
+    "import_notice": "Contas importadas não serão associadas à sua Frase Secreta de Recuperação da carteira Moonchain.",
     "imported": "Importado",
     "view_private_key": "Visualizar chave privada",
     "view_private_key_notice": "Aviso: Nunca revele esta chave. Qualquer pessoa com suas chaves privadas pode roubar todos os ativos mantidos em sua conta.",
@@ -302,8 +302,8 @@
     "duplicate_account_import_notice": "A conta que você está tentando importar é uma duplicata.",
     "unable_to_launch_email_app": "Incapaz de iniciar o aplicativo de email",
     "max_fee": "Taxa Máxima",
-    "deposit_from_exchanges_notice": "Compre de {0}, {1} bolsas e deposite zkEVM MXC diretamente na carteira AXS",
-    "deposit_with_l3_bridge_notice": "Compre de outras bolsas e use {0} para depositar ERC20 MXC na carteira AXS",
+    "deposit_from_exchanges_notice": "Compre de {0}, {1} bolsas e deposite zkEVM MXC diretamente na carteira Moonchain",
+    "deposit_with_l3_bridge_notice": "Compre de outras bolsas e use {0} para depositar ERC20 MXC na carteira Moonchain",
     "buy_some_x_for_fee_notice": "Compre algum {0} para pagar a taxa de gás para a transação, normalmente menos de 2 USD quando a rede não está ocupada.",
     "insufficient_funds_notice": "Saldo insuficiente para esta transação. Por favor, adicione fundos.",
     "contractCall": "Chamada de contrato",
@@ -322,8 +322,8 @@
     "gas_fee_replacement_notice": "Esta taxa de gás substituirá a original.",
     "unknown": "Desconhecido",
     "transaction_finalized": "Transação Finalizada",
-    "background_fetch_notice_title": "Otimize Sua Experiência com a Carteira AXS",
-    "background_fetch_notice_text": "Para garantir o desempenho máximo da Carteira AXS, recomendamos manter o aplicativo ativo em segundo plano e excluí-lo das configurações de otimização de bateria. Isso ajuda a manter a funcionalidade contínua e o acesso ininterrupto à sua carteira.",
+    "background_fetch_notice_title": "Otimize Sua Experiência com a Carteira Moonchain",
+    "background_fetch_notice_text": "Para garantir o desempenho máximo da Carteira Moonchain, recomendamos manter o aplicativo ativo em segundo plano e excluí-lo das configurações de otimização de bateria. Isso ajuda a manter a funcionalidade contínua e o acesso ininterrupto à sua carteira.",
     "acknowledge": "Reconhecer",
     "background_notifications_service_launched_successfully": "O serviço de notificações em segundo plano foi lançado com sucesso.",
     "unable_to_launch_background_notification_service": "Incapaz de iniciar o serviço de notificação em segundo plano.",
@@ -351,7 +351,7 @@
     "auto_claim_execution_dialog_text": "O tempo para a reivindicação automática expirou. Gostaria de executar a reivindicação automática agora?",
     "execute": "Execute - Execute",
     "auto_claim_scheduling_text": "A auto-reivindicação será executada às {0} amanhã",
-    "wifi_location_background_fetch_notice_text": "Para garantir o desempenho máximo da Carteira AXS, recomendamos manter o aplicativo ativo em segundo plano e excluí-lo das configurações de otimização de bateria. Isso ajuda a manter a funcionalidade contínua e o acesso ininterrupto à sua carteira. Por favor, note que apenas os ganchos de localização hexagonal WiFi usarão serviços de localização em segundo plano; outros serviços dentro do aplicativo não acessarão sua localização enquanto o aplicativo estiver rodando em segundo plano.",
+    "wifi_location_background_fetch_notice_text": "Para garantir o desempenho máximo da Carteira Moonchain, recomendamos manter o aplicativo ativo em segundo plano e excluí-lo das configurações de otimização de bateria. Isso ajuda a manter a funcionalidade contínua e o acesso ininterrupto à sua carteira. Por favor, note que apenas os ganchos de localização hexagonal WiFi usarão serviços de localização em segundo plano; outros serviços dentro do aplicativo não acessarão sua localização enquanto o aplicativo estiver rodando em segundo plano.",
     "wifi_hexagon_location_hooks": "Ganchos de localização hexagonal Wi-Fi",
     "mxc_top_up_notification_text": "Oi {0}! Você adicionou {1} MXC à sua carteira hoje. Continue fazendo-a crescer!",
     "mxc_top_up_notification_title": "Parabéns pelo novo Recarga",
@@ -379,16 +379,16 @@
     "wifi_info_notifications_title": "Atualização de Transação Wi-Fi Bem-sucedida",
     "wifi_info_notifications_text": "Você atualizou com sucesso a lista de redes Wi-Fi ao enviar uma transação para o MXC zkEVM.",
     "wifi_info_tx_failed": "Ops, a atualização da transação Wi-Fi falhou!",
-    "axs_background_location_service_text": "O serviço de localização em segundo plano da carteira AXS para conexões Wi-Fi está em execução... .",
-    "axs_background_location_service_title": "Serviço de localização da carteira AXS",
+    "moonchain_background_location_service_text": "O serviço de localização em segundo plano da carteira Moonchain para conexões Wi-Fi está em execução... .",
+    "moonchain_background_location_service_title": "Serviço de localização da carteira Moonchain",
     "unable_to_retrieve_wifi_info_successfully": "Não foi possível recuperar as informações do wifi com sucesso!",
     "auto_claim_started": "Início da Reivindicação Automática 🏁",
     "no_miners_selected_notification_title": "Parece que você não selecionou nenhum minerador. ℹ️",
     "no_miners_selected_notification_text": "Por favor, vá para o minerador DApp para selecionar os mineradores.",
     "auto_claim_successful_notification_title": "Mineração auto-reivindicada com sucesso ✅",
-    "auto_claim_successful_notification_text": "A carteira AXS foi reivindicada com sucesso, você minerou tokens.",
+    "auto_claim_successful_notification_text": "A carteira Moonchain foi reivindicada com sucesso, você minerou tokens.",
     "nothing_to_claim_notification_title": "Ops, Nada para reivindicar ℹ️",
-    "nothing_to_claim_notification_text": "A carteira AXS tentou reivindicar seus tokens minerados, mas não encontrou nenhum token para reivindicar.",
+    "nothing_to_claim_notification_text": "A carteira Moonchain tentou reivindicar seus tokens minerados, mas não encontrou nenhum token para reivindicar.",
     "auto_claim_failed": "Falha na auto-reivindicação do minerador ❌",
     "no_miners_owned_notification": "Parece que esta carteira não possui nenhum minerador. ℹ️",
     "mining_tokens_from_miner": "Minerando tokens do Minerador #{0}. ⛏️",
@@ -396,9 +396,9 @@
     "tokens_mined_successfully_miner": "Minerador #{0}: Tokens minerados com sucesso. ✅",
     "token_mining_failed": "Minerador #{0}: Processo de mineração de token falhou. ❌",
     "merkle_proof_error": "Erro ao tentar verificar a prova de Merkle.",
-    "axs_location_permission_use_case": "A carteira AXS precisa de acesso à sua localização para recursos como conexões Wi-Fi enquanto o aplicativo está em uso ou funcionando em segundo plano. Seus dados de localização não são salvos ou compartilhados com terceiros.",
-    "axs_camera_permission_use_case": "A carteira AXS precisa de acesso à sua câmera quando o aplicativo está em uso para serviços como a cunhagem de RWA. Os dados da imagem não são salvos ou compartilhados com terceiros.",
-    "axs_photos_permission_use_case": "A carteira AXS precisa de acesso às suas fotos para salvar imagens como RWA. Suas fotos não são salvas ou compartilhadas com terceiros.",
+    "moonchain_location_permission_use_case": "A carteira Moonchain precisa de acesso à sua localização para recursos como conexões Wi-Fi enquanto o aplicativo está em uso ou funcionando em segundo plano. Seus dados de localização não são salvos ou compartilhados com terceiros.",
+    "moonchain_camera_permission_use_case": "A carteira Moonchain precisa de acesso à sua câmera quando o aplicativo está em uso para serviços como a cunhagem de RWA. Os dados da imagem não são salvos ou compartilhados com terceiros.",
+    "moonchain_photos_permission_use_case": "A carteira Moonchain precisa de acesso às suas fotos para salvar imagens como RWA. Suas fotos não são salvas ou compartilhadas com terceiros.",
     "permission_use_cases": "Casos de uso de permissão",
     "ok_allow": "Ok, Permita",
     "not_now": "Agora não",
@@ -416,7 +416,7 @@
     "local_secured_storage": "Armazenamento seguro local",
     "save_locally": "Guarde localmente",
     "save_locally_description": "Certifique-se de salvar suas chaves localmente e então você estará pronto para prosseguir.",
-    "axs_storage_permission_use_case": "A carteira AXS precisa de acesso ao seu armazenamento para recursos como RWA. Seus dados de armazenamento não são salvos ou compartilhados com terceiros.",
+    "moonchain_storage_permission_use_case": "A carteira Moonchain precisa de acesso ao seu armazenamento para recursos como RWA. Seus dados de armazenamento não são salvos ou compartilhados com terceiros.",
     "local_backup": "Backup local",
     "no_description": "Sem descrição",
     "bluetooth_not_supported": "O Bluetooth não é suportado neste dispositivo.",
@@ -443,9 +443,9 @@
     "no_rings_selected_notification_title": "Parece que você não selecionou nenhum Anel de Mirtilo. ℹ️",
     "no_rings_selected_notification_text": "Por favor, vá para o DApp Blueberry Ring para selecionar anéis.",
     "auto_sync_successful_notification_title": "Sucesso na auto-reivindicação do Blueberry Ring ✅",
-    "auto_sync_successful_notification_text": "A carteira AXS foi sincronizada com sucesso com os seus dados de anel.",
+    "auto_sync_successful_notification_text": "A carteira Moonchain foi sincronizada com sucesso com os seus dados de anel.",
     "already_synced_notification_title": "Ops, já sincronizado ℹ️",
-    "already_synced_notification_text": "A carteira AXS tentou sincronizar seus dados de anel, mas parece que você já sincronizou os dados do anel hoje.",
+    "already_synced_notification_text": "A carteira Moonchain tentou sincronizar seus dados de anel, mas parece que você já sincronizou os dados do anel hoje.",
     "auto_sync_failed": "Falha na sincronização automática do Blueberry Ring ❌",
     "no_rings_owned_notification": "Parece que esta carteira não possui nenhum Blueberry Rings. ℹ️",
     "syncing_data_from_ring": "Sincronizando dados do Anel de Mirtilo #{0}. ⛏️",
@@ -453,5 +453,23 @@
     "data_synced_successfully_ring": "Anel de Mirtilo #{0}: Dados sincronizados com sucesso. ✅",
     "data_syncing_failed": "Anel de Mirtilo #{0}: Processo de sincronização de dados falhou. ❌",
     "blueberry_hooks": "Ganchos de Mirtilo",
-    "message": "Mensagem"
+    "message": "Mensagem",
+    "moonchain_username": "Nome de usuário do Moonchain",
+    "powered_by_moonchain_supernodes": "Impulsionado por Supernós Moonchain",
+    "moonchain_design_documents": "Documentos de design do Moonchain",
+    "continue_now": "Continuar Agora",
+    "you_will_be_directed_to_the_main_app": "Você será direcionado para o aplicativo principal",
+    "account_setup_complete": "Configuração da Conta Concluída!",
+    "entering_the_app": "Entrando no App",
+    "in": "Carregando..",
+    "google_drive_secured_storage": "Armazenamento seguro do Google Drive",
+    "icloud_secured_storage": "Armazenamento seguro do iCloud",
+    "make_sure_you_have_stored_your_keys_correctly_in_your_x": "Certifique-se de que você armazenou suas chaves corretamente em seu {0}",
+    "icloud": "iCloud",
+    "google_drive": "Google Drive",
+    "store_in_x": "Armazenar em {0}",
+    "your_email_address": "Seu Endereço de Email",
+    "invalid_email": "Por favor, insira um endereço de e-mail válido (por exemplo, {name@example.com})",
+    "email": "E-mail",
+    "hello": "Olá"
 }
\ No newline at end of file
diff --git a/assets/flutter_i18n/ro.json b/assets/flutter_i18n/ro.json
index 4bde8ddb..76d0b8a6 100644
--- a/assets/flutter_i18n/ro.json
+++ b/assets/flutter_i18n/ro.json
@@ -10,11 +10,11 @@
     "confirm_passcode_desc": "Tastează din nou codul tău secret",
     "secret_recovery_phrase": "Fraza secretă de recuperare",
     "import_your_wallet": "Importați Portofelul Dvs",
-    "word_seed_phrase": "Pur și simplu importați portofelul dvs. existent cu fraza de recuperare de 12, 18 sau 24 de cuvinte, sau descărcați din e-mail fișierul text cu cheia portofelului AXS și lipiți fraza de recuperare aici.",
+    "word_seed_phrase": "Pur și simplu importați portofelul dvs. existent cu fraza de recuperare de 12, 18 sau 24 de cuvinte, sau descărcați din e-mail fișierul text cu cheia portofelului Moonchain și lipiți fraza de recuperare aici.",
     "confirm": "Confirmă",
     "choose_my_username": "Alegeți numele meu de utilizator",
     "mnemonic_passphrase": "Fraza Mnemonică",
-    "biometrics_setup": "Configurare Biometrie AXS",
+    "biometrics_setup": "Configurare Biometrie Moonchain",
     "mxc_zkevm_username": "Nume de utilizator MXC zkEVM",
     "ens_announcement_description": "Cu unicul tău nume de utilizator MXC zkEVM, procesul greoi de gestionare a adreselor complexe de portofel devine un lucru al trecutului. Acum, poți folosi fără efort un nume personalizat și exclusiv care te diferențiază.",
     "choose_your_username": "Alegeți-vă unicul nume de utilizator MXC zkEVM",
@@ -41,12 +41,12 @@
     "send": "Trimite",
     "received": "Primit",
     "sent": "Trimis",
-    "email_secured_body": "Pentru securitatea și confidențialitatea portofelului dvs. AXS, este esențial să păstrați toate informațiile conținute în acest e-mail strict confidențiale.\nVă rugăm să urmați cu atenție următorii pași:\n1. Asigurați-vă că sunteți singurul destinatar al acestui e-mail înlocuind adresa destinatarului cu a dvs.\n2. După confirmarea adresei de e-mail corecte, continuați să faceți clic pe butonul 'Trimite' pentru a vă transmite aceste informații vitale în siguranță. Respectând aceste măsuri, veți asigura cea mai mare siguranță pentru portofelul dvs. AXS. Vă mulțumim pentru diligența dvs. în această problemă.",
-    "email_secured_subject": "Securizează-ți Cheia Portofelului AXS - Instrucțiuni Importante",
+    "email_secured_body": "Pentru securitatea și confidențialitatea portofelului dvs. Moonchain, este esențial să păstrați toate informațiile conținute în acest e-mail strict confidențiale.\nVă rugăm să urmați cu atenție următorii pași:\n1. Asigurați-vă că sunteți singurul destinatar al acestui e-mail înlocuind adresa destinatarului cu a dvs.\n2. După confirmarea adresei de e-mail corecte, continuați să faceți clic pe butonul 'Trimite' pentru a vă transmite aceste informații vitale în siguranță. Respectând aceste măsuri, veți asigura cea mai mare siguranță pentru portofelul dvs. Moonchain. Vă mulțumim pentru diligența dvs. în această problemă.",
+    "email_secured_subject": "Securizează-ți Cheia Portofelului Moonchain - Instrucțiuni Importante",
     "face_id": "Identificare facială",
     "fingerprint": "Amprentă digitală",
     "touch_id": "ID-ul prin atingere",
-    "unlock_axs_wallet": "Deblochează-ți portofelul AXS",
+    "unlock_moonchain_wallet": "Deblochează-ți portofelul Moonchain",
     "enter_your_passcode": "Introduceți codul dvs. de acces",
     "attempts_x": "{0} din 6 încercări",
     "forgot_passcode": "Mi-am uitat codul de acces",
@@ -217,8 +217,8 @@
     "networks": "Rețele",
     "added": "Adăugat",
     "want_to_add_this_network": "Doriți să adăugați această rețea?",
-    "network_adding_usage_notice": "Adăugarea acestei rețele, îi permite să fie utilizată în cadrul AXS.",
-    "custom_network_security_alert": "AXS nu susține rețele personalizate sau securitatea acestora.",
+    "network_adding_usage_notice": "Adăugarea acestei rețele, îi permite să fie utilizată în cadrul Moonchain.",
+    "custom_network_security_alert": "Moonchain nu susține rețele personalizate sau securitatea acestora.",
     "block_explorer_url": "URL-ul exploratorului de blocuri",
     "new_network_added": "Rețea nouă adăugată",
     "x_is_now_available": "\"{0}\" este acum disponibil în selectorul de rețea.",
@@ -288,11 +288,11 @@
     "send_&_receive": "Trimite & Primește",
     "contract": "Contract",
     "decimals": "Zecimale",
-    "add_token_success_message": "Ura! Tokenul a fost adăugat cu succes în portofelul tău AXS! 🎉",
+    "add_token_success_message": "Ura! Tokenul a fost adăugat cu succes în portofelul tău Moonchain! 🎉",
     "import_account": "Importă contul",
     "add_account": "Adaugă cont",
     "private_key": "Cheie privată",
-    "import_notice": "Conturile importate nu vor fi asociate cu fraza ta secretă de recuperare a portofelului AXS.",
+    "import_notice": "Conturile importate nu vor fi asociate cu fraza ta secretă de recuperare a portofelului Moonchain.",
     "imported": "Importat",
     "view_private_key": "Vizualizează cheia privată",
     "view_private_key_notice": "Avertisment: Nu divulgați niciodată această cheie. Oricine are cheile dvs. private poate fura toate activele deținute în contul dvs.",
@@ -302,8 +302,8 @@
     "duplicate_account_import_notice": "Contul pe care încercați să-l importați este un duplicat.",
     "unable_to_launch_email_app": "Imposibil de lansat aplicația de email",
     "max_fee": "Taxă Maximă",
-    "deposit_from_exchanges_notice": "Cumpărați de la {0}, {1} burse și depuneți direct zkEVM MXC în portofelul AXS",
-    "deposit_with_l3_bridge_notice": "Cumpărați de la alte burse și utilizați {0} pentru a depune MXC ERC20 în portofelul AXS.",
+    "deposit_from_exchanges_notice": "Cumpărați de la {0}, {1} burse și depuneți direct zkEVM MXC în portofelul Moonchain",
+    "deposit_with_l3_bridge_notice": "Cumpărați de la alte burse și utilizați {0} pentru a depune MXC ERC20 în portofelul Moonchain.",
     "buy_some_x_for_fee_notice": "Cumpărați ceva {0} pentru a plăti taxa de gaz pentru tranzacție, de obicei mai puțin de 2 USD când rețeaua nu este ocupată.",
     "insufficient_funds_notice": "Sold insuficient pentru această tranzacție. Vă rugăm să adăugați fonduri.",
     "contractCall": "Apel de contract",
@@ -322,8 +322,8 @@
     "gas_fee_replacement_notice": "Acest comision pentru gaz va înlocui originalul.",
     "unknown": "Necunoscut",
     "transaction_finalized": "Tranzacție Finalizată",
-    "background_fetch_notice_title": "Optimizează-ți Experiența cu Portofelul AXS",
-    "background_fetch_notice_text": "Pentru a asigura performanța maximă a portofelului AXS, recomandăm să mențineți aplicația activă în fundal și să o excludeți din setările de optimizare a bateriei. Acest lucru ajută la menținerea unei funcționalități fără întreruperi și a unui acces neîntrerupt la portofelul dvs.",
+    "background_fetch_notice_title": "Optimizează-ți Experiența cu Portofelul Moonchain",
+    "background_fetch_notice_text": "Pentru a asigura performanța maximă a portofelului Moonchain, recomandăm să mențineți aplicația activă în fundal și să o excludeți din setările de optimizare a bateriei. Acest lucru ajută la menținerea unei funcționalități fără întreruperi și a unui acces neîntrerupt la portofelul dvs.",
     "acknowledge": "Recunoaște",
     "background_notifications_service_launched_successfully": "Serviciul de notificări în fundal a fost lansat cu succes.",
     "unable_to_launch_background_notification_service": "Imposibil de lansat serviciul de notificare în fundal.",
@@ -351,7 +351,7 @@
     "auto_claim_execution_dialog_text": "Timpul pentru revendicare automată a expirat. Doriți să executați acum revendicarea automată?",
     "execute": "Executați",
     "auto_claim_scheduling_text": "Auto-claim se va executa la {0} mâine",
-    "wifi_location_background_fetch_notice_text": "Pentru a asigura performanța maximă a Portofelului AXS, recomandăm să mențineți aplicația activă în fundal și să o excludeți din setările de optimizare a bateriei. Acest lucru ajută la menținerea unei funcționalități fără întreruperi și a unui acces neîntrerupt la portofelul dvs. Vă rugăm să rețineți că doar cârligele de localizare hexagonale WiFi vor utiliza serviciile de localizare în fundal; alte servicii din cadrul aplicației nu vor accesa locația dvs. în timp ce aplicația rulează în fundal.",
+    "wifi_location_background_fetch_notice_text": "Pentru a asigura performanța maximă a Portofelului Moonchain, recomandăm să mențineți aplicația activă în fundal și să o excludeți din setările de optimizare a bateriei. Acest lucru ajută la menținerea unei funcționalități fără întreruperi și a unui acces neîntrerupt la portofelul dvs. Vă rugăm să rețineți că doar cârligele de localizare hexagonale WiFi vor utiliza serviciile de localizare în fundal; alte servicii din cadrul aplicației nu vor accesa locația dvs. în timp ce aplicația rulează în fundal.",
     "wifi_hexagon_location_hooks": "Ancore de locație hexagonale Wi-Fi",
     "mxc_top_up_notification_text": "Hei {0}! Ai adăugat astăzi {1} MXC în portofelul tău. Continuă să-l crești!",
     "mxc_top_up_notification_title": "Felicitări pentru noua încărcare",
@@ -379,16 +379,16 @@
     "wifi_info_notifications_title": "Actualizare de Tranzacție Wi-Fi Reușită",
     "wifi_info_notifications_text": "Ați actualizat cu succes lista de rețele Wi-Fi prin trimiterea unei tranzacții către MXC zkEVM.",
     "wifi_info_tx_failed": "Hopa, actualizarea tranzacției Wi-Fi a eșuat!",
-    "axs_background_location_service_text": "Serviciul de localizare în fundal pentru AXS wallet, folosind conexiuni Wi-Fi, este în funcțiune... .",
-    "axs_background_location_service_title": "Serviciul de localizare a portofelului AXS",
+    "moonchain_background_location_service_text": "Serviciul de localizare în fundal pentru Moonchain wallet, folosind conexiuni Wi-Fi, este în funcțiune... .",
+    "moonchain_background_location_service_title": "Serviciul de localizare a portofelului Moonchain",
     "unable_to_retrieve_wifi_info_successfully": "Imposibil de recuperat cu succes informațiile wifi!",
     "auto_claim_started": "Începută Revendicarea Automată 🏁",
     "no_miners_selected_notification_title": "Se pare că nu ai selectat niciun miner. ℹ️",
     "no_miners_selected_notification_text": "Vă rugăm să mergeți la miner DApp pentru a selecta mineri.",
     "auto_claim_successful_notification_title": "Miner aut-claim reușit ✅",
-    "auto_claim_successful_notification_text": "Portofelul AXS a fost revendicat cu succes, ai minat token-uri.",
+    "auto_claim_successful_notification_text": "Portofelul Moonchain a fost revendicat cu succes, ai minat token-uri.",
     "nothing_to_claim_notification_title": "Hopa, Nimic de revendicat ℹ️",
-    "nothing_to_claim_notification_text": "Portofelul AXS a încercat să revendice tokenii pe care i-ai minat, dar nu a găsit niciun token de revendicat.",
+    "nothing_to_claim_notification_text": "Portofelul Moonchain a încercat să revendice tokenii pe care i-ai minat, dar nu a găsit niciun token de revendicat.",
     "auto_claim_failed": "Eșec la auto-revendicarea minerului ❌",
     "no_miners_owned_notification": "Se pare că acest portofel nu deține niciun miner. ℹ️",
     "mining_tokens_from_miner": "Extragerea de tokeni de la Minerul #{0}. ⛏️",
@@ -396,9 +396,9 @@
     "tokens_mined_successfully_miner": "Minerul #{0}: Tokeni minați cu succes. ✅",
     "token_mining_failed": "Minerul #{0}: Procesul de minare a token-ului a eșuat. ❌",
     "merkle_proof_error": "Eroare în timpul încercării de a verifica dovada Merkle.",
-    "axs_location_permission_use_case": "Portofelul AXS are nevoie de acces la locația dvs. pentru funcții precum conexiuni Wi-Fi în timp ce aplicația este utilizată sau rulează în fundal. Datele dvs. de localizare nu sunt salvate sau partajate cu terți.",
-    "axs_camera_permission_use_case": "Portofelul AXS are nevoie de acces la camera dvs. când aplicația este în uz pentru servicii precum emiterea RWA. Datele imaginii nu sunt salvate sau partajate cu terți.",
-    "axs_photos_permission_use_case": "Portofelul AXS are nevoie de acces la fotografiile tale pentru a salva imagini precum RWA. Fotografiile tale nu sunt salvate sau partajate cu nicio terță parte.",
+    "moonchain_location_permission_use_case": "Portofelul Moonchain are nevoie de acces la locația dvs. pentru funcții precum conexiuni Wi-Fi în timp ce aplicația este utilizată sau rulează în fundal. Datele dvs. de localizare nu sunt salvate sau partajate cu terți.",
+    "moonchain_camera_permission_use_case": "Portofelul Moonchain are nevoie de acces la camera dvs. când aplicația este în uz pentru servicii precum emiterea RWA. Datele imaginii nu sunt salvate sau partajate cu terți.",
+    "moonchain_photos_permission_use_case": "Portofelul Moonchain are nevoie de acces la fotografiile tale pentru a salva imagini precum RWA. Fotografiile tale nu sunt salvate sau partajate cu nicio terță parte.",
     "permission_use_cases": "Cazuri de utilizare a permisiunilor",
     "ok_allow": "Bine, Permiteți",
     "not_now": "Nu acum",
@@ -416,7 +416,7 @@
     "local_secured_storage": "Depozitare securizată locală",
     "save_locally": "Salvează local",
     "save_locally_description": "Asigurați-vă că salvați cheile local și apoi sunteți gata de plecare.",
-    "axs_storage_permission_use_case": "Portofelul AXS are nevoie de acces la spațiul tău de stocare pentru funcții precum RWA. Datele tale de stocare nu sunt salvate sau partajate cu terțe părți.",
+    "moonchain_storage_permission_use_case": "Portofelul Moonchain are nevoie de acces la spațiul tău de stocare pentru funcții precum RWA. Datele tale de stocare nu sunt salvate sau partajate cu terțe părți.",
     "local_backup": "Copie de rezervă locală",
     "no_description": "Fără descriere",
     "bluetooth_not_supported": "Bluetooth nu este suportat pe acest dispozitiv.",
@@ -443,9 +443,9 @@
     "no_rings_selected_notification_title": "Se pare că nu ai selectat niciun Inel de Afine. ℹ️",
     "no_rings_selected_notification_text": "Vă rugăm să mergeți la Blueberry Ring DApp pentru a selecta inelele.",
     "auto_sync_successful_notification_title": "Succes la auto-revendicarea Blueberry Ring ✅",
-    "auto_sync_successful_notification_text": "Portofelul AXS a sincronizat cu succes datele inelului tău.",
+    "auto_sync_successful_notification_text": "Portofelul Moonchain a sincronizat cu succes datele inelului tău.",
     "already_synced_notification_title": "Ups, deja sincronizat ℹ️",
-    "already_synced_notification_text": "Portofelul AXS a încercat să sincronizeze datele tale de inel, dar se pare că ai sincronizat deja datele de inel astăzi.",
+    "already_synced_notification_text": "Portofelul Moonchain a încercat să sincronizeze datele tale de inel, dar se pare că ai sincronizat deja datele de inel astăzi.",
     "auto_sync_failed": "Eșec la sincronizarea automată a Blueberry Ring ❌",
     "no_rings_owned_notification": "Se pare că acest portofel nu deține niciun Blueberry Rings. ℹ️",
     "syncing_data_from_ring": "Sincronizare date de la Blueberry Ring #{0}. ⛏️",
@@ -453,5 +453,23 @@
     "data_synced_successfully_ring": "Inelul Blueberry #{0}: Datele au fost sincronizate cu succes. ✅",
     "data_syncing_failed": "Inelul Blueberry #{0}: Procesul de sincronizare a datelor a eșuat. ❌",
     "blueberry_hooks": "Cârlige de afine",
-    "message": "Mesaj"
+    "message": "Mesaj",
+    "moonchain_username": "Nume de utilizator Moonchain",
+    "powered_by_moonchain_supernodes": "Asistență de la Supernodurile Moonchain",
+    "moonchain_design_documents": "Documente de proiectare Moonchain",
+    "continue_now": "Continuă acum",
+    "you_will_be_directed_to_the_main_app": "Veți fi redirecționat către aplicația principală",
+    "account_setup_complete": "Configurarea contului finalizată!",
+    "entering_the_app": "Intrare în aplicație",
+    "in": "Încărcare..",
+    "google_drive_secured_storage": "Stocare securizată Google Drive",
+    "icloud_secured_storage": "Stocare securizată iCloud",
+    "make_sure_you_have_stored_your_keys_correctly_in_your_x": "Asigurați-vă că ați stocat corect tastele în {0}",
+    "icloud": "iCloud",
+    "google_drive": "Google Drive",
+    "store_in_x": "Stocați în {0}",
+    "your_email_address": "Adresa dumneavoastră de e-mail",
+    "invalid_email": "Vă rugăm să introduceți o adresă de e-mail validă (de ex., nume@exemplu.com)",
+    "email": "E-mail",
+    "hello": "Salut"
 }
\ No newline at end of file
diff --git a/assets/flutter_i18n/ru.json b/assets/flutter_i18n/ru.json
index 60060a13..ee1c6b06 100644
--- a/assets/flutter_i18n/ru.json
+++ b/assets/flutter_i18n/ru.json
@@ -10,11 +10,11 @@
     "confirm_passcode_desc": "Введите заново ваш пароль",
     "secret_recovery_phrase": "Секретная фраза для восстановления",
     "import_your_wallet": "Импортируйте Ваш Кошелек",
-    "word_seed_phrase": "Просто импортируйте свой существующий кошелек с помощью вашей фразы восстановления из 12, 18 или 24 слов, или загрузите из электронной почты текстовый файл ключа кошелька AXS и вставьте фразу восстановления здесь.",
+    "word_seed_phrase": "Просто импортируйте свой существующий кошелек с помощью вашей фразы восстановления из 12, 18 или 24 слов, или загрузите из электронной почты текстовый файл ключа кошелька Moonchain и вставьте фразу восстановления здесь.",
     "confirm": "Подтвердить",
     "choose_my_username": "Выберите имя пользователя",
     "mnemonic_passphrase": "Мнемоническая Фраза",
-    "biometrics_setup": "Настройка биометрии AXS",
+    "biometrics_setup": "Настройка биометрии Moonchain",
     "mxc_zkevm_username": "MXC zkEVM Имя пользователя",
     "ens_announcement_description": "С вашим уникальным MXC zkEVM именем пользователя, неприятный и нервынй процесс работы со сложными адресами крипто кошельков остается в прошлом. Теперь вы можете без труда использовать индивидуальное и эксклюзивное имя, которое выделяет вас из общей массы.",
     "choose_your_username": "Выберите свое уникальное имя пользователя MXC zkEVM",
@@ -41,12 +41,12 @@
     "send": "Отправить",
     "received": "Получено",
     "sent": "Отправлено",
-    "email_secured_body": "Для безопасности и конфиденциальности вашего кошелька AXS важно, чтобы вы сохраняли всю информацию из этого письма строго конфиденциальной.\nПожалуйста, внимательно следуйте следующим шагам:\n1. Убедитесь, что вы единственный получатель этого письма, заменив адрес получателя на свой собственный.\n2. После подтверждения правильного адреса электронной почты нажмите кнопку 'Отправить', чтобы безопасно переслать эту важную информацию себе. Соблюдая эти меры, вы обеспечите максимальную безопасность для вашего кошелька AXS. Благодарим за вашу бдительность в этом вопросе.",
-    "email_secured_subject": "Защитите ключ вашего AXS кошелька - Важные инструкции",
+    "email_secured_body": "Для безопасности и конфиденциальности вашего кошелька Moonchain важно, чтобы вы сохраняли всю информацию из этого письма строго конфиденциальной.\nПожалуйста, внимательно следуйте следующим шагам:\n1. Убедитесь, что вы единственный получатель этого письма, заменив адрес получателя на свой собственный.\n2. После подтверждения правильного адреса электронной почты нажмите кнопку 'Отправить', чтобы безопасно переслать эту важную информацию себе. Соблюдая эти меры, вы обеспечите максимальную безопасность для вашего кошелька Moonchain. Благодарим за вашу бдительность в этом вопросе.",
+    "email_secured_subject": "Защитите ключ вашего Moonchain кошелька - Важные инструкции",
     "face_id": "Face ID",
     "fingerprint": "Отпечаток пальца",
     "touch_id": "Touch ID",
-    "unlock_axs_wallet": "Откройте ваш кошелек AXS",
+    "unlock_moonchain_wallet": "Откройте ваш кошелек Moonchain",
     "enter_your_passcode": "Введите ваш код доступа",
     "attempts_x": "{0} из 6 попыток",
     "forgot_passcode": "Я забыл(а) свой паполь",
@@ -217,8 +217,8 @@
     "networks": "Сети",
     "added": "Добавлено",
     "want_to_add_this_network": "Хотите добавить эту сеть?",
-    "network_adding_usage_notice": "Добавление этой сети позволяет использовать ее внутри AXS.",
-    "custom_network_security_alert": "AXS не поддерживает пользовательские сети или их безопасность.",
+    "network_adding_usage_notice": "Добавление этой сети позволяет использовать ее внутри Moonchain.",
+    "custom_network_security_alert": "Moonchain не поддерживает пользовательские сети или их безопасность.",
     "block_explorer_url": "URL-адрес обозревателя блоков",
     "new_network_added": "Новая сеть добавлена",
     "x_is_now_available": "\"{0}\" теперь доступен в сетевом селекторе.",
@@ -288,11 +288,11 @@
     "send_&_receive": "Отправить и Получить",
     "contract": "Контракт",
     "decimals": "Десятичные числа",
-    "add_token_success_message": "Ура! Токен был успешно добавлен в ваш AXS кошелек! 🎉",
+    "add_token_success_message": "Ура! Токен был успешно добавлен в ваш Moonchain кошелек! 🎉",
     "import_account": "Импортировать аккаунт",
     "add_account": "Добавить аккаунт",
     "private_key": "Приватный ключ",
-    "import_notice": "Импортированные аккаунты не будут связаны с вашей секретной фразой восстановления кошелька AXS.",
+    "import_notice": "Импортированные аккаунты не будут связаны с вашей секретной фразой восстановления кошелька Moonchain.",
     "imported": "Импортированный",
     "view_private_key": "Просмотреть приватный ключ",
     "view_private_key_notice": "Предупреждение: Никогда не раскрывайте этот ключ. Любой, у кого есть ваши приватные ключи, может украсть все активы, хранящиеся на вашем счету.",
@@ -302,8 +302,8 @@
     "duplicate_account_import_notice": "Учетная запись, которую вы пытаетесь импортировать, является дубликатом.",
     "unable_to_launch_email_app": "Не удается запустить приложение для электронной почты",
     "max_fee": "Максимальная комиссия",
-    "deposit_from_exchanges_notice": "Купите от {0}, {1} бирж и напрямую внесите zkEVM MXC в кошелек AXS",
-    "deposit_with_l3_bridge_notice": "Покупайте на других биржах и используйте {0} для депозита ERC20 MXC в кошелек AXS",
+    "deposit_from_exchanges_notice": "Купите от {0}, {1} бирж и напрямую внесите zkEVM MXC в кошелек Moonchain",
+    "deposit_with_l3_bridge_notice": "Покупайте на других биржах и используйте {0} для депозита ERC20 MXC в кошелек Moonchain",
     "buy_some_x_for_fee_notice": "Купите немного {0} для оплаты комиссии за транзакцию, обычно меньше 2 долларов США, когда сеть не загружена.",
     "insufficient_funds_notice": "Недостаточный баланс для этой транзакции. Пожалуйста, пополните счет.",
     "contractCall": "Вызов контракта",
@@ -322,8 +322,8 @@
     "gas_fee_replacement_notice": "Эта комиссия за газ заменит оригинал.",
     "unknown": "Неизвестно",
     "transaction_finalized": "Транзакция Завершена",
-    "background_fetch_notice_title": "Оптимизируйте свой опыт использования кошелька AXS",
-    "background_fetch_notice_text": "Для обеспечения пиковой производительности кошелька AXS мы рекомендуем оставлять приложение активным в фоновом режиме и исключать его из настроек оптимизации батареи. Это помогает поддерживать бесперебойную работу и непрерывный доступ к вашему кошельку.",
+    "background_fetch_notice_title": "Оптимизируйте свой опыт использования кошелька Moonchain",
+    "background_fetch_notice_text": "Для обеспечения пиковой производительности кошелька Moonchain мы рекомендуем оставлять приложение активным в фоновом режиме и исключать его из настроек оптимизации батареи. Это помогает поддерживать бесперебойную работу и непрерывный доступ к вашему кошельку.",
     "acknowledge": "Признать",
     "background_notifications_service_launched_successfully": "Сервис фоновых уведомлений успешно запущен.",
     "unable_to_launch_background_notification_service": "Не удалось запустить сервис уведомлений в фоновом режиме.",
@@ -351,7 +351,7 @@
     "auto_claim_execution_dialog_text": "Время для автоматического заявления истекло. Хотите ли вы выполнить автоматическое заявление сейчас?",
     "execute": "Выполнить",
     "auto_claim_scheduling_text": "Авто-заявка будет выполнена в {0} завтра.",
-    "wifi_location_background_fetch_notice_text": "Чтобы обеспечить максимальную производительность кошелька AXS, мы рекомендуем оставлять приложение активным в фоновом режиме и исключать его из настроек оптимизации батареи. Это помогает поддерживать бесперебойную работу и непрерывный доступ к вашему кошельку. Обратите внимание, что только хексагональные местоположения WiFi будут использовать службы геолокации в фоновом режиме; другие службы в приложении не будут получать доступ к вашему местоположению, пока приложение работает в фоновом режиме.",
+    "wifi_location_background_fetch_notice_text": "Чтобы обеспечить максимальную производительность кошелька Moonchain, мы рекомендуем оставлять приложение активным в фоновом режиме и исключать его из настроек оптимизации батареи. Это помогает поддерживать бесперебойную работу и непрерывный доступ к вашему кошельку. Обратите внимание, что только хексагональные местоположения WiFi будут использовать службы геолокации в фоновом режиме; другие службы в приложении не будут получать доступ к вашему местоположению, пока приложение работает в фоновом режиме.",
     "wifi_hexagon_location_hooks": "Wi-Fi шестигранное местоположение крючки",
     "mxc_top_up_notification_text": "Привет {0}! Вы добавили сегодня {1} MXC в свой кошелек. Продолжайте увеличивать его!",
     "mxc_top_up_notification_title": "Поздравляем с новым пополнением",
@@ -379,16 +379,16 @@
     "wifi_info_notifications_title": "Успешное Обновление Wi-Fi Транзакции",
     "wifi_info_notifications_text": "Вы успешно обновили список Wi-Fi сетей, отправив транзакцию в MXC zkEVM.",
     "wifi_info_tx_failed": "Ой, обновление транзакции через Wi-Fi не удалось!",
-    "axs_background_location_service_text": "Служба определения местоположения в фоновом режиме для Wi-Fi соединений в кошельке AXS работает... .",
-    "axs_background_location_service_title": "Сервис местоположения кошелька AXS",
+    "moonchain_background_location_service_text": "Служба определения местоположения в фоновом режиме для Wi-Fi соединений в кошельке Moonchain работает... .",
+    "moonchain_background_location_service_title": "Сервис местоположения кошелька Moonchain",
     "unable_to_retrieve_wifi_info_successfully": "Не удалось успешно получить информацию о wifi!",
     "auto_claim_started": "Автоматическое Возмещение Запущено 🏁",
     "no_miners_selected_notification_title": "Похоже, вы не выбрали ни одного майнера. ℹ️",
     "no_miners_selected_notification_text": "Пожалуйста, перейдите к майнерскому DApp для выбора майнеров.",
     "auto_claim_successful_notification_title": "Успешное авто-претензирование майнера ✅",
-    "auto_claim_successful_notification_text": "Кошелек AXS был успешно заявлен, вы добыли токены",
+    "auto_claim_successful_notification_text": "Кошелек Moonchain был успешно заявлен, вы добыли токены",
     "nothing_to_claim_notification_title": "Упс, нечего заявлять ℹ️",
-    "nothing_to_claim_notification_text": "Кошелек AXS попытался заявить ваши добытые токены, но не нашел никаких токенов для претензии.",
+    "nothing_to_claim_notification_text": "Кошелек Moonchain попытался заявить ваши добытые токены, но не нашел никаких токенов для претензии.",
     "auto_claim_failed": "Ошибка авто-заявки майнера ❌",
     "no_miners_owned_notification": "Похоже, что у этого кошелька нет никаких майнеров. ℹ️",
     "mining_tokens_from_miner": "Добыча токенов от майнера #{0}. ⛏️",
@@ -396,9 +396,9 @@
     "tokens_mined_successfully_miner": "Майнер #{0}: Токены успешно добыты. ✅",
     "token_mining_failed": "Майнер #{0}: Процесс добычи токенов не удался. ❌",
     "merkle_proof_error": "Ошибка при попытке проверить доказательство Меркла.",
-    "axs_location_permission_use_case": "Кошелек AXS требует доступа к вашему местоположению для таких функций, как Wi-Fi соединения, пока приложение используется или работает в фоновом режиме. Ваши данные о местоположении не сохраняются и не передаются третьим сторонам.",
-    "axs_camera_permission_use_case": "Кошелек AXS требует доступа к вашей камере, когда приложение используется для таких услуг, как чеканка RWA. Данные изображений не сохраняются и не передаются третьим сторонам.",
-    "axs_photos_permission_use_case": "Кошелек AXS требует доступа к вашим фотографиям для сохранения изображений, таких как RWA. Ваши фотографии не сохраняются и не передаются третьим сторонам.",
+    "moonchain_location_permission_use_case": "Кошелек Moonchain требует доступа к вашему местоположению для таких функций, как Wi-Fi соединения, пока приложение используется или работает в фоновом режиме. Ваши данные о местоположении не сохраняются и не передаются третьим сторонам.",
+    "moonchain_camera_permission_use_case": "Кошелек Moonchain требует доступа к вашей камере, когда приложение используется для таких услуг, как чеканка RWA. Данные изображений не сохраняются и не передаются третьим сторонам.",
+    "moonchain_photos_permission_use_case": "Кошелек Moonchain требует доступа к вашим фотографиям для сохранения изображений, таких как RWA. Ваши фотографии не сохраняются и не передаются третьим сторонам.",
     "permission_use_cases": "Сценарии использования разрешений",
     "ok_allow": "Хорошо, Разрешить",
     "not_now": "Не сейчас",
@@ -416,7 +416,7 @@
     "local_secured_storage": "Местное защищенное хранилище",
     "save_locally": "Сохранить локально",
     "save_locally_description": "Убедитесь, что вы сохранили свои ключи локально, и тогда вы готовы к работе.",
-    "axs_storage_permission_use_case": "Кошелек AXS требует доступа к вашему хранилищу для функций, таких как RWA. Ваши данные хранения не сохраняются и не передаются третьим сторонам.",
+    "moonchain_storage_permission_use_case": "Кошелек Moonchain требует доступа к вашему хранилищу для функций, таких как RWA. Ваши данные хранения не сохраняются и не передаются третьим сторонам.",
     "local_backup": "Локальное резервное копирование",
     "no_description": "Нет описания",
     "bluetooth_not_supported": "Bluetooth не поддерживается на этом устройстве.",
@@ -443,9 +443,9 @@
     "no_rings_selected_notification_title": "Похоже, вы не выбрали ни одного Blueberry Rings. ℹ️",
     "no_rings_selected_notification_text": "Пожалуйста, перейдите в Blueberry Ring DApp для выбора колец.",
     "auto_sync_successful_notification_title": "Успешное авто-выполнение Blueberry Ring ✅",
-    "auto_sync_successful_notification_text": "Кошелек AXS успешно синхронизировал ваши данные кольца.",
+    "auto_sync_successful_notification_text": "Кошелек Moonchain успешно синхронизировал ваши данные кольца.",
     "already_synced_notification_title": "Упс, уже синхронизировано ℹ️",
-    "already_synced_notification_text": "Кошелек AXS попытался синхронизировать ваши данные кольца, но похоже, что вы уже синхронизировали данные кольца сегодня.",
+    "already_synced_notification_text": "Кошелек Moonchain попытался синхронизировать ваши данные кольца, но похоже, что вы уже синхронизировали данные кольца сегодня.",
     "auto_sync_failed": "Синхронизация Blueberry Ring не удалась ❌",
     "no_rings_owned_notification": "Похоже, что в этом кошельке нет Blueberry Rings. ℹ️",
     "syncing_data_from_ring": "Синхронизация данных с Blueberry Ring #{0}. ⛏️",
@@ -453,5 +453,23 @@
     "data_synced_successfully_ring": "Кольцо Blueberry #{0}: Данные успешно синхронизированы. ✅",
     "data_syncing_failed": "Черничное кольцо #{0}: Процесс синхронизации данных не удался. ❌",
     "blueberry_hooks": "Крючки для черники",
-    "message": "Сообщение"
+    "message": "Сообщение",
+    "moonchain_username": "Имя пользователя Moonchain",
+    "powered_by_moonchain_supernodes": "Работает на суперузлах Moonchain",
+    "moonchain_design_documents": "Документы по проектированию Moonchain",
+    "continue_now": "Продолжить сейчас",
+    "you_will_be_directed_to_the_main_app": "Вы будете перенаправлены на главное приложение",
+    "account_setup_complete": "Настройка учетной записи завершена!",
+    "entering_the_app": "Вход в приложение",
+    "in": "Загрузка..",
+    "google_drive_secured_storage": "Защищенное хранилище Google Диска",
+    "icloud_secured_storage": "Хранилище iCloud с защитой",
+    "make_sure_you_have_stored_your_keys_correctly_in_your_x": "Убедитесь, что вы правильно сохранили свои ключи в {0}",
+    "icloud": "iCloud",
+    "google_drive": "Google Диск",
+    "store_in_x": "Сохранить в {0}",
+    "your_email_address": "Ваш адрес электронной почты",
+    "invalid_email": "Пожалуйста, введите действительный адрес электронной почты (например, name@example.com)",
+    "email": "Электронная почта",
+    "hello": "Привет"
 }
\ No newline at end of file
diff --git a/assets/flutter_i18n/tr.json b/assets/flutter_i18n/tr.json
index 2ac40c4b..6135005e 100644
--- a/assets/flutter_i18n/tr.json
+++ b/assets/flutter_i18n/tr.json
@@ -10,11 +10,11 @@
     "confirm_passcode_desc": "Tekrar şifrenizi yazın",
     "secret_recovery_phrase": "Gizli kurtarma ifadesi",
     "import_your_wallet": "Cüzdanınızı İçe Aktarın",
-    "word_seed_phrase": "Basitçe, mevcut cüzdanınızı 12, 18 veya 24 kelimelik kurtarma ifadenizle içe aktarın veya AXS cüzdan anahtar metin dosyasını e-postadan indirin ve kurtarma ifadenizi buraya yapıştırın.",
+    "word_seed_phrase": "Basitçe, mevcut cüzdanınızı 12, 18 veya 24 kelimelik kurtarma ifadenizle içe aktarın veya Moonchain cüzdan anahtar metin dosyasını e-postadan indirin ve kurtarma ifadenizi buraya yapıştırın.",
     "confirm": "Onayla",
     "choose_my_username": "Kullanıcı adımı seç",
     "mnemonic_passphrase": "Mnemonik Parola",
-    "biometrics_setup": "AXS Biyometrik Ayarı",
+    "biometrics_setup": "Moonchain Biyometrik Ayarı",
     "mxc_zkevm_username": "MXC zkEVM Kullanıcı Adı",
     "ens_announcement_description": "Benzersiz MXC zkEVM kullanıcı adınız ile, karmaşık cüzdan adreslerini işlemenin hantal süreci geçmişte kaldı. Artık, sizi farklı kılan özelleştirilmiş ve özel bir adı zahmetsizce kullanabilirsiniz.",
     "choose_your_username": "Benzersiz MXC zkEVM kullanıcı adınızı seçin",
@@ -41,12 +41,12 @@
     "send": "Gönder",
     "received": "Alındı",
     "sent": "Gönderildi",
-    "email_secured_body": "AXS cüzdanınızın güvenliği ve gizliliği için, bu e-postada bulunan tüm bilgileri kesinlikle gizli tutmanız esastır.\nLütfen aşağıdaki adımları dikkatlice izleyin:\n1. Bu e-postanın tek alıcısı olduğunuzdan emin olmak için alıcının adresini kendi adresinizle değiştirin.\n2. Doğru e-posta adresini onayladıktan sonra, bu önemli bilgileri kendinize güvenli bir şekilde iletmek için 'Gönder' düğmesine tıklayın. Bu önlemlere uyarak, AXS cüzdanınızın en üst düzeyde güvende olmasını sağlarsınız. Bu konudaki özeniniz için teşekkür ederiz.",
-    "email_secured_subject": "AXS Cüzdan Anahtarınızı Güvenceye Alın - Önemli Talimatlar",
+    "email_secured_body": "Moonchain cüzdanınızın güvenliği ve gizliliği için, bu e-postada bulunan tüm bilgileri kesinlikle gizli tutmanız esastır.\nLütfen aşağıdaki adımları dikkatlice izleyin:\n1. Bu e-postanın tek alıcısı olduğunuzdan emin olmak için alıcının adresini kendi adresinizle değiştirin.\n2. Doğru e-posta adresini onayladıktan sonra, bu önemli bilgileri kendinize güvenli bir şekilde iletmek için 'Gönder' düğmesine tıklayın. Bu önlemlere uyarak, Moonchain cüzdanınızın en üst düzeyde güvende olmasını sağlarsınız. Bu konudaki özeniniz için teşekkür ederiz.",
+    "email_secured_subject": "Moonchain Cüzdan Anahtarınızı Güvenceye Alın - Önemli Talimatlar",
     "face_id": "Yüz ID",
     "fingerprint": "Parmak izi",
     "touch_id": "Dokunma ID",
-    "unlock_axs_wallet": "AXS cüzdanınızın kilidini açın",
+    "unlock_moonchain_wallet": "Moonchain cüzdanınızın kilidini açın",
     "enter_your_passcode": "Şifrenizi girin",
     "attempts_x": "6 deneme içinden {0}",
     "forgot_passcode": "Şifremi unuttum",
@@ -217,8 +217,8 @@
     "networks": "Ağlar",
     "added": "Eklenmiş",
     "want_to_add_this_network": "Bu ağı eklemek ister misiniz?",
-    "network_adding_usage_notice": "Bu ağı eklemek, onun AXS içinde kullanılmasına izin verir.",
-    "custom_network_security_alert": "AXS, özel ağları veya güvenliklerini onaylamaz.",
+    "network_adding_usage_notice": "Bu ağı eklemek, onun Moonchain içinde kullanılmasına izin verir.",
+    "custom_network_security_alert": "Moonchain, özel ağları veya güvenliklerini onaylamaz.",
     "block_explorer_url": "Blok gezgini url",
     "new_network_added": "Yeni ağ eklendi",
     "x_is_now_available": "\"{0}\" artık ağ seçicisinde mevcut.",
@@ -242,7 +242,7 @@
     "confirm_delete_wallet": "Cüzdanınızı sıfırlamak istediğinizden emin misiniz?",
     "confirm_delete_wallet_note": "Lütfen bu işlemin geri alınamaz olduğunu unutmayın. Cüzdanınız sıfırlandığında, ödeme yöntemleriniz, işlem geçmişiniz ve varsa tüm dijital para birimleri kalıcı olarak silinecektir.\n\nCüzdanınızın yedeğini almadıysanız, önemli bilgi veya varlıklarınızı kaybetmemek için şimdi yapmanızı şiddetle tavsiye ederiz.",
     "understand_delete": "Anladım, sıfırla",
-    "delete_wallet_warning": "\"Mevcut cüzdanınızı sıfırlamak için \"evet\" yazın\"",
+    "delete_wallet_warning": "\"Mevcut cüzdanınızı sıfırlamak için \"yes\" yazın\"",
     "type_yes": "\"yes\" yazın",
     "clear_browser_successfully": "Geçmiş ve çerezler başarıyla temizlendi",
     "exported_logs_successfully": "Başarıyla dışa aktarılan loglar",
@@ -288,11 +288,11 @@
     "send_&_receive": "Gönder & Al",
     "contract": "Sözleşme",
     "decimals": "Ondalıklar",
-    "add_token_success_message": "Hurra! Token başarıyla AXS cüzdanınıza eklendi! 🎉",
+    "add_token_success_message": "Hurra! Token başarıyla Moonchain cüzdanınıza eklendi! 🎉",
     "import_account": "Hesabı İçe Aktar",
     "add_account": "Hesap Ekle",
     "private_key": "Özel anahtar",
-    "import_notice": "İçe aktarılan hesaplar, AXS cüzdanınızın Gizli Kurtarma İfadesi ile ilişkilendirilmeyecektir.",
+    "import_notice": "İçe aktarılan hesaplar, Moonchain cüzdanınızın Gizli Kurtarma İfadesi ile ilişkilendirilmeyecektir.",
     "imported": "İthal edilmiş",
     "view_private_key": "Özel anahtarı görüntüle",
     "view_private_key_notice": "Uyarı: Bu anahtarı asla açıklamayın. Özel anahtarlarınıza sahip olan herkes, hesabınızdaki tüm varlıkları çalabilir.",
@@ -302,8 +302,8 @@
     "duplicate_account_import_notice": "İçe aktarmaya çalıştığınız hesap bir kopyadır.",
     "unable_to_launch_email_app": "E-posta uygulaması başlatılamıyor",
     "max_fee": "Maksimum Ücret",
-    "deposit_from_exchanges_notice": "{0}, {1} borsalarından satın alın ve zkEVM MXC'yi doğrudan AXS cüzdanına yatırın.",
-    "deposit_with_l3_bridge_notice": "Diğer borsalardan satın alın ve ERC20 MXC'yi AXS cüzdanına yatırmak için {0} kullanın.",
+    "deposit_from_exchanges_notice": "{0}, {1} borsalarından satın alın ve zkEVM MXC'yi doğrudan Moonchain cüzdanına yatırın.",
+    "deposit_with_l3_bridge_notice": "Diğer borsalardan satın alın ve ERC20 MXC'yi Moonchain cüzdanına yatırmak için {0} kullanın.",
     "buy_some_x_for_fee_notice": "İşlem için gaz ücretini ödemek üzere biraz {0} satın alın, ağ meşgul olmadığında genellikle 2 USD'den azdır.",
     "insufficient_funds_notice": "Bu işlem için yetersiz bakiye. Lütfen fon ekleyin.",
     "contractCall": "Sözleşme çağrısı",
@@ -322,8 +322,8 @@
     "gas_fee_replacement_notice": "Bu gaz ücreti, orijinalin yerini alacak.",
     "unknown": "Bilinmeyen",
     "transaction_finalized": "İşlem Tamamlandı",
-    "background_fetch_notice_title": "AXS Cüzdan Deneyiminizi Optimize Edin",
-    "background_fetch_notice_text": "AXS Cüzdan'ın en üst düzey performansını sağlamak için, uygulamanın arka planda aktif kalmasını ve pil optimizasyonu ayarlarından çıkarılmasını öneririz. Bu, kesintisiz işlevsellik ve cüzdanınıza kesintisiz erişim sağlar.",
+    "background_fetch_notice_title": "Moonchain Cüzdan Deneyiminizi Optimize Edin",
+    "background_fetch_notice_text": "Moonchain Cüzdan'ın en üst düzey performansını sağlamak için, uygulamanın arka planda aktif kalmasını ve pil optimizasyonu ayarlarından çıkarılmasını öneririz. Bu, kesintisiz işlevsellik ve cüzdanınıza kesintisiz erişim sağlar.",
     "acknowledge": "Onayla",
     "background_notifications_service_launched_successfully": "Arka plan bildirimleri hizmeti başarıyla başlatıldı.",
     "unable_to_launch_background_notification_service": "Arka plan bildirim hizmeti başlatılamıyor.",
@@ -351,7 +351,7 @@
     "auto_claim_execution_dialog_text": "Otomatik talep için zaman doldu. Şimdi otomatik talebi gerçekleştirmek ister misiniz?",
     "execute": "Yürüt",
     "auto_claim_scheduling_text": "Otomatik talep, yarın {0} 'da gerçekleştirilecek.",
-    "wifi_location_background_fetch_notice_text": "AXS Cüzdan'ın en üst düzey performansını sağlamak için, uygulamanın arka planda aktif kalmasını ve pil optimizasyonu ayarlarından çıkarılmasını öneririz. Bu, kesintisiz işlevsellik ve cüzdanınıza kesintisiz erişim sağlar. Lütfen sadece WiFi hexagon konum kancalarının arka planda konum hizmetlerini kullanacağını; uygulama içindeki diğer hizmetlerin, uygulama arka planda çalışırken konumunuza erişmeyeceğini unutmayın.",
+    "wifi_location_background_fetch_notice_text": "Moonchain Cüzdan'ın en üst düzey performansını sağlamak için, uygulamanın arka planda aktif kalmasını ve pil optimizasyonu ayarlarından çıkarılmasını öneririz. Bu, kesintisiz işlevsellik ve cüzdanınıza kesintisiz erişim sağlar. Lütfen sadece WiFi hexagon konum kancalarının arka planda konum hizmetlerini kullanacağını; uygulama içindeki diğer hizmetlerin, uygulama arka planda çalışırken konumunuza erişmeyeceğini unutmayın.",
     "wifi_hexagon_location_hooks": "Wi-Fi altıgen konum kancaları",
     "mxc_top_up_notification_text": "Merhaba {0}! Bugün cüzdanınıza {1} MXC eklediniz. Büyümeye devam edin!",
     "mxc_top_up_notification_title": "Yeni Yükleme için Tebrikler",
@@ -379,16 +379,16 @@
     "wifi_info_notifications_title": "Başarılı Wi-Fi İşlem Güncellemesi",
     "wifi_info_notifications_text": "MXC zkEVM'ye bir işlem göndererek Wi-Fi ağlarının listesini başarıyla güncellediniz.",
     "wifi_info_tx_failed": "Hata, Wi-Fi İşlem Güncellemesi başarısız oldu!",
-    "axs_background_location_service_text": "AXS cüzdanı arka plan konum hizmeti Wi-Fi bağlantıları için çalışıyor... .",
-    "axs_background_location_service_title": "AXS cüzdan konum servisi",
+    "moonchain_background_location_service_text": "Moonchain cüzdanı arka plan konum hizmeti Wi-Fi bağlantıları için çalışıyor... .",
+    "moonchain_background_location_service_title": "Moonchain cüzdan konum servisi",
     "unable_to_retrieve_wifi_info_successfully": "Wifi bilgisi başarıyla alınamadı!",
     "auto_claim_started": "Otomatik Talep Başlatıldı 🏁",
     "no_miners_selected_notification_title": "Görünüşe göre herhangi bir madenci seçmediniz. ℹ️",
     "no_miners_selected_notification_text": "Lütfen madencileri seçmek için miner DApp'a gidin.",
     "auto_claim_successful_notification_title": "Madenci otomatik talebi başarılı ✅",
-    "auto_claim_successful_notification_text": "AXS cüzdanınız başarıyla talep edildi ve madencilik yaptığınız tokenler alındı.",
+    "auto_claim_successful_notification_text": "Moonchain cüzdanınız başarıyla talep edildi ve madencilik yaptığınız tokenler alındı.",
     "nothing_to_claim_notification_title": "Hata, Talep edilecek bir şey yok ℹ️",
-    "nothing_to_claim_notification_text": "AXS cüzdanınız madencilik yaptığınız tokenleri talep etmeye çalıştı, ancak talep edilecek herhangi bir token bulamadı.",
+    "nothing_to_claim_notification_text": "Moonchain cüzdanınız madencilik yaptığınız tokenleri talep etmeye çalıştı, ancak talep edilecek herhangi bir token bulamadı.",
     "auto_claim_failed": "Madenci otomatik talep başarısız oldu ❌",
     "no_miners_owned_notification": "Görünüşe göre bu cüzdanın hiç madencisi yok. ℹ️",
     "mining_tokens_from_miner": "Madenci #{0} tarafından token çıkarılıyor. ⛏️",
@@ -396,9 +396,9 @@
     "tokens_mined_successfully_miner": "Madenci #{0}: Token'lar başarıyla çıkarıldı. ✅",
     "token_mining_failed": "Madenci #{0}: Token madencilik işlemi başarısız oldu. ❌",
     "merkle_proof_error": "Merkle kanıtını doğrulamaya çalışırken hata oluştu.",
-    "axs_location_permission_use_case": "AXS Cüzdanı, uygulama kullanılırken veya arka planda çalışırken Wi-Fi kancaları gibi özelliklere erişim için konumunuza ihtiyaç duyar. Konum verileriniz kaydedilmez veya üçüncü taraflarla paylaşılmaz.",
-    "axs_camera_permission_use_case": "AXS Cüzdanı, RWA basımı gibi hizmetler için uygulama kullanılırken kameranıza erişim gerektirir. Görüntü verileri kaydedilmez veya üçüncü taraflarla paylaşılmaz.",
-    "axs_photos_permission_use_case": "AXS Cüzdanı, RWA gibi görüntüleri kaydetmek için fotoğraflarınıza erişim hakkına ihtiyaç duyar. Fotoğraflarınız hiçbir üçüncü taraf ile kaydedilmez veya paylaşılmaz.",
+    "moonchain_location_permission_use_case": "Moonchain Cüzdanı, uygulama kullanılırken veya arka planda çalışırken Wi-Fi kancaları gibi özelliklere erişim için konumunuza ihtiyaç duyar. Konum verileriniz kaydedilmez veya üçüncü taraflarla paylaşılmaz.",
+    "moonchain_camera_permission_use_case": "Moonchain Cüzdanı, RWA basımı gibi hizmetler için uygulama kullanılırken kameranıza erişim gerektirir. Görüntü verileri kaydedilmez veya üçüncü taraflarla paylaşılmaz.",
+    "moonchain_photos_permission_use_case": "Moonchain Cüzdanı, RWA gibi görüntüleri kaydetmek için fotoğraflarınıza erişim hakkına ihtiyaç duyar. Fotoğraflarınız hiçbir üçüncü taraf ile kaydedilmez veya paylaşılmaz.",
     "permission_use_cases": "İzin kullanım durumları",
     "ok_allow": "Tamam, İzin Ver",
     "not_now": "Şimdi değil",
@@ -416,7 +416,7 @@
     "local_secured_storage": "Yerel güvenli depolama",
     "save_locally": "Yerel olarak kaydet",
     "save_locally_description": "Anahtarlarınızı yerel olarak kaydettiğinizden emin olun ve sonra işlem yapmaya hazırsınız.",
-    "axs_storage_permission_use_case": "AXS Cüzdanı, RWA gibi özellikler için depolama alanınıza erişim gerektirir. Depolama verileriniz hiçbir üçüncü taraf ile kaydedilmez veya paylaşılmaz.",
+    "moonchain_storage_permission_use_case": "Moonchain Cüzdanı, RWA gibi özellikler için depolama alanınıza erişim gerektirir. Depolama verileriniz hiçbir üçüncü taraf ile kaydedilmez veya paylaşılmaz.",
     "local_backup": "Yerel yedekleme",
     "no_description": "Açıklama yok",
     "bluetooth_not_supported": "Bu cihazda Bluetooth desteklenmiyor.",
@@ -443,9 +443,9 @@
     "no_rings_selected_notification_title": "Görünüşe göre herhangi bir Blueberry Rings seçmemişsiniz. ℹ️",
     "no_rings_selected_notification_text": "Lütfen yüzük seçmek için Blueberry Ring DApp'e gidin.",
     "auto_sync_successful_notification_title": "Blueberry Ring otomatik talep başarılı ✅",
-    "auto_sync_successful_notification_text": "AXS cüzdanınız başarıyla halka verilerinizi senkronize etti.",
+    "auto_sync_successful_notification_text": "Moonchain cüzdanınız başarıyla halka verilerinizi senkronize etti.",
     "already_synced_notification_title": "Hata, Zaten senkronize edildi ℹ️",
-    "already_synced_notification_text": "AXS cüzdanınız yüzük verilerinizi senkronize etmeye çalıştı, ancak görünüşe göre yüzük verilerinizi bugün senkronize etmişsiniz.",
+    "already_synced_notification_text": "Moonchain cüzdanınız yüzük verilerinizi senkronize etmeye çalıştı, ancak görünüşe göre yüzük verilerinizi bugün senkronize etmişsiniz.",
     "auto_sync_failed": "Blueberry Ring otomatik senkronizasyon başarısız oldu ❌",
     "no_rings_owned_notification": "Görünüşe göre bu cüzdanın hiç Mavi Yüzük'ü yok. ℹ️",
     "syncing_data_from_ring": "Blueberry Ring #{0} 'dan veri senkronizasyonu yapılıyor. ⛏️",
@@ -453,5 +453,23 @@
     "data_synced_successfully_ring": "Yaban Mersini Halkası #{0}: Veri başarıyla senkronize edildi. ✅",
     "data_syncing_failed": "Yaban Mersini Halkası #{0}: Veri senkronizasyon işlemi başarısız oldu. ❌",
     "blueberry_hooks": "Yaban Mersini Çengelleri",
-    "message": "Mesaj"
+    "message": "Mesaj",
+    "moonchain_username": "AyZincir Kullanıcı Adı",
+    "powered_by_moonchain_supernodes": "Moonchain Süper Düğümleri ile Güçlendirilmiştir",
+    "moonchain_design_documents": "AyZincir tasarım belgeleri",
+    "continue_now": "Şimdi Devam Et",
+    "you_will_be_directed_to_the_main_app": "Ana uygulamaya yönlendirileceksiniz.",
+    "account_setup_complete": "Hesap Kurulumu Tamamlandı!",
+    "entering_the_app": "Uygulamaya Giriş",
+    "in": "Yükleniyor..",
+    "google_drive_secured_storage": "Google Drive güvenli depolama alanı",
+    "icloud_secured_storage": "iCloud Güvenli depolama",
+    "make_sure_you_have_stored_your_keys_correctly_in_your_x": "Anahtarlarınızı {0} içinde doğru şekilde sakladığınızdan emin olun.",
+    "icloud": "iCloud",
+    "google_drive": "Google Drive",
+    "store_in_x": "{0}'da sakla",
+    "your_email_address": "E-posta Adresiniz",
+    "invalid_email": "Lütfen geçerli bir e-posta adresi girin (örneğin, name@example.com)",
+    "email": "E-posta",
+    "hello": "Merhaba"
 }
\ No newline at end of file
diff --git a/assets/flutter_i18n/vi.json b/assets/flutter_i18n/vi.json
index 08224dc2..aadb28a4 100644
--- a/assets/flutter_i18n/vi.json
+++ b/assets/flutter_i18n/vi.json
@@ -10,11 +10,11 @@
     "confirm_passcode_desc": "Nhập lại mã bảo mật của bạn",
     "secret_recovery_phrase": "Cụm từ khôi phục bí mật",
     "import_your_wallet": "Nhập Ví Của Bạn",
-    "word_seed_phrase": "Chỉ cần nhập ví hiện tại của bạn với cụm từ khôi phục 12, 18 hoặc 24 từ, hoặc tải xuống từ email tệp văn bản khóa ví AXS và dán cụm từ khôi phục vào đây",
+    "word_seed_phrase": "Chỉ cần nhập ví hiện tại của bạn với cụm từ khôi phục 12, 18 hoặc 24 từ, hoặc tải xuống từ email tệp văn bản khóa ví Moonchain và dán cụm từ khôi phục vào đây",
     "confirm": "Xác nhận",
     "choose_my_username": "Chọn tên người dùng của tôi",
     "mnemonic_passphrase": "Cụm từ Mnemonic",
-    "biometrics_setup": "Cài Đặt Sinh Trắc Học AXS",
+    "biometrics_setup": "Cài Đặt Sinh Trắc Học Moonchain",
     "mxc_zkevm_username": "Tên người dùng MXC zkEVM",
     "ens_announcement_description": "Với tên người dùng MXC zkEVM độc đáo của bạn, quá trình xử lý các địa chỉ ví phức tạp đã trở thành chuyện cũ. Bây giờ, bạn có thể sử dụng một tên tùy chỉnh và độc quyền mà không gặp bất kỳ khó khăn nào, giúp bạn nổi bật hơn.",
     "choose_your_username": "Chọn tên người dùng MXC zkEVM độc đáo của bạn",
@@ -41,12 +41,12 @@
     "send": "Gửi",
     "received": "Đã nhận",
     "sent": "Đã gửi",
-    "email_secured_body": "Để đảm bảo an ninh và riêng tư cho ví AXS của bạn, điều cần thiết là bạn phải giữ kín mọi thông tin trong email này. \nVui lòng thực hiện cẩn thận các bước tiếp theo: \n1. Đảm bảo rằng bạn là người duy nhất nhận được email này bằng cách thay địa chỉ người nhận bằng địa chỉ của bạn. \n2. Sau khi xác nhận đúng địa chỉ email, hãy tiếp tục nhấp vào nút 'Gửi' để chuyển thông tin quan trọng này cho chính bạn một cách an toàn. Bằng cách tuân thủ những biện pháp này, bạn sẽ đảm bảo an toàn tối đa cho ví AXS của mình. Cảm ơn sự cẩn trọng của bạn trong vấn đề này.",
-    "email_secured_subject": "Bảo Mật Khóa Ví AXS Của Bạn - Hướng Dẫn Quan Trọng",
+    "email_secured_body": "Để đảm bảo an ninh và riêng tư cho ví Moonchain của bạn, điều cần thiết là bạn phải giữ kín mọi thông tin trong email này. \nVui lòng thực hiện cẩn thận các bước tiếp theo: \n1. Đảm bảo rằng bạn là người duy nhất nhận được email này bằng cách thay địa chỉ người nhận bằng địa chỉ của bạn. \n2. Sau khi xác nhận đúng địa chỉ email, hãy tiếp tục nhấp vào nút 'Gửi' để chuyển thông tin quan trọng này cho chính bạn một cách an toàn. Bằng cách tuân thủ những biện pháp này, bạn sẽ đảm bảo an toàn tối đa cho ví Moonchain của mình. Cảm ơn sự cẩn trọng của bạn trong vấn đề này.",
+    "email_secured_subject": "Bảo Mật Khóa Ví Moonchain Của Bạn - Hướng Dẫn Quan Trọng",
     "face_id": "Khuôn mặt ID",
     "fingerprint": "Dấu vân tay",
     "touch_id": "ID Dấu Vân Tay",
-    "unlock_axs_wallet": "Mở khóa ví AXS của bạn",
+    "unlock_moonchain_wallet": "Mở khóa ví Moonchain của bạn",
     "enter_your_passcode": "Nhập mã bảo mật của bạn",
     "attempts_x": "{0} trên tổng số 6 lần thử",
     "forgot_passcode": "Tôi đã quên mã bảo mật của tôi",
@@ -217,8 +217,8 @@
     "networks": "Mạng lưới",
     "added": "Đã thêm",
     "want_to_add_this_network": "Muốn thêm mạng này?",
-    "network_adding_usage_notice": "Thêm mạng này, cho phép nó được sử dụng trong AXS",
-    "custom_network_security_alert": "AXS không chấp nhận các mạng tùy chỉnh hoặc an ninh của họ.",
+    "network_adding_usage_notice": "Thêm mạng này, cho phép nó được sử dụng trong Moonchain",
+    "custom_network_security_alert": "Moonchain không chấp nhận các mạng tùy chỉnh hoặc an ninh của họ.",
     "block_explorer_url": "Url khám phá khối",
     "new_network_added": "Mạng mới đã được thêm vào",
     "x_is_now_available": "\"{0}\" giờ đây đã có trong bộ chọn mạng.",
@@ -288,11 +288,11 @@
     "send_&_receive": "Gửi & Nhận",
     "contract": "Hợp đồng",
     "decimals": "Số thập phân",
-    "add_token_success_message": "Hú hồn! Token đã được thêm thành công vào ví AXS của bạn! 🎉",
+    "add_token_success_message": "Hú hồn! Token đã được thêm thành công vào ví Moonchain của bạn! 🎉",
     "import_account": "Nhập tài khoản",
     "add_account": "Thêm tài khoản",
     "private_key": "Khóa riêng tư",
-    "import_notice": "Các tài khoản được nhập vào sẽ không được liên kết với Cụm từ Khôi phục Bí mật của ví AXS của bạn.",
+    "import_notice": "Các tài khoản được nhập vào sẽ không được liên kết với Cụm từ Khôi phục Bí mật của ví Moonchain của bạn.",
     "imported": "Đã nhập khẩu",
     "view_private_key": "Xem khóa riêng tư",
     "view_private_key_notice": "Cảnh báo: Đừng bao giờ tiết lộ khóa này. Bất kỳ ai có khóa riêng của bạn đều có thể ăn cắp tất cả tài sản được giữ trong tài khoản của bạn.",
@@ -302,8 +302,8 @@
     "duplicate_account_import_notice": "Tài khoản bạn đang cố gắng nhập vào là một bản sao.",
     "unable_to_launch_email_app": "Không thể khởi chạy ứng dụng email",
     "max_fee": "Phí Tối Đa",
-    "deposit_from_exchanges_notice": "Mua từ {0}, {1} sàn giao dịch và nạp zkEVM MXC trực tiếp vào ví AXS",
-    "deposit_with_l3_bridge_notice": "Mua từ các sàn giao dịch khác và sử dụng {0} để nạp MXC ERC20 vào ví AXS",
+    "deposit_from_exchanges_notice": "Mua từ {0}, {1} sàn giao dịch và nạp zkEVM MXC trực tiếp vào ví Moonchain",
+    "deposit_with_l3_bridge_notice": "Mua từ các sàn giao dịch khác và sử dụng {0} để nạp MXC ERC20 vào ví Moonchain",
     "buy_some_x_for_fee_notice": "Mua một số {0} để trả phí gas cho giao dịch, thường ít hơn 2 USD khi mạng không bận rộn",
     "insufficient_funds_notice": "Số dư không đủ cho giao dịch này. Vui lòng nạp thêm tiền.",
     "contractCall": "Gọi hợp đồng",
@@ -322,8 +322,8 @@
     "gas_fee_replacement_notice": "Phí gas này sẽ thay thế cho cái gốc",
     "unknown": "Không rõ",
     "transaction_finalized": "Giao dịch đã hoàn tất",
-    "background_fetch_notice_title": "Tối Ưu Hóa Trải Nghiệm Ví AXS Của Bạn",
-    "background_fetch_notice_text": "Để đảm bảo hiệu suất tối đa của Ví AXS, chúng tôi khuyến nghị giữ ứng dụng hoạt động ở chế độ nền và loại bỏ nó khỏi cài đặt tối ưu hóa pin. Điều này giúp duy trì chức năng liền mạch và truy cập không gián đoạn vào ví của bạn.",
+    "background_fetch_notice_title": "Tối Ưu Hóa Trải Nghiệm Ví Moonchain Của Bạn",
+    "background_fetch_notice_text": "Để đảm bảo hiệu suất tối đa của Ví Moonchain, chúng tôi khuyến nghị giữ ứng dụng hoạt động ở chế độ nền và loại bỏ nó khỏi cài đặt tối ưu hóa pin. Điều này giúp duy trì chức năng liền mạch và truy cập không gián đoạn vào ví của bạn.",
     "acknowledge": "Công nhận",
     "background_notifications_service_launched_successfully": "Dịch vụ thông báo nền đã được khởi chạy thành công.",
     "unable_to_launch_background_notification_service": "Không thể khởi chạy dịch vụ thông báo nền.",
@@ -351,7 +351,7 @@
     "auto_claim_execution_dialog_text": "Thời gian cho việc tự động yêu cầu đã hết. Bạn có muốn thực hiện yêu cầu tự động ngay bây giờ không?",
     "execute": "Thực hiện",
     "auto_claim_scheduling_text": "Tự động yêu cầu sẽ được thực hiện vào {0} ngày mai",
-    "wifi_location_background_fetch_notice_text": "Để đảm bảo hiệu suất tối đa của Ví AXS, chúng tôi khuyến nghị giữ ứng dụng hoạt động ở chế độ nền và loại bỏ nó khỏi cài đặt tối ưu hóa pin. Điều này giúp duy trì chức năng liên tục và truy cập không gián đoạn vào ví của bạn. Xin lưu ý rằng chỉ các móc vị trí lục giác WiFi sẽ sử dụng dịch vụ vị trí ở chế độ nền; các dịch vụ khác trong ứng dụng sẽ không truy cập vào vị trí của bạn khi ứng dụng đang chạy ở chế độ nền.",
+    "wifi_location_background_fetch_notice_text": "Để đảm bảo hiệu suất tối đa của Ví Moonchain, chúng tôi khuyến nghị giữ ứng dụng hoạt động ở chế độ nền và loại bỏ nó khỏi cài đặt tối ưu hóa pin. Điều này giúp duy trì chức năng liên tục và truy cập không gián đoạn vào ví của bạn. Xin lưu ý rằng chỉ các móc vị trí lục giác WiFi sẽ sử dụng dịch vụ vị trí ở chế độ nền; các dịch vụ khác trong ứng dụng sẽ không truy cập vào vị trí của bạn khi ứng dụng đang chạy ở chế độ nền.",
     "wifi_hexagon_location_hooks": "Móc vị trí lục giác Wi-Fi",
     "mxc_top_up_notification_text": "Chào {0}! Bạn đã thêm {1} MXC vào ví của mình hôm nay. Hãy tiếp tục làm nó phát triển!",
     "mxc_top_up_notification_title": "Chúc mừng về việc Nạp thêm mới",
@@ -379,16 +379,16 @@
     "wifi_info_notifications_title": "Cập Nhật Giao Dịch Wi-Fi Thành Công",
     "wifi_info_notifications_text": "Bạn đã cập nhật thành công danh sách các mạng Wi-Fi bằng cách gửi giao dịch đến MXC zkEVM.",
     "wifi_info_tx_failed": "Rất tiếc, Cập nhật Giao dịch Wi-Fi thất bại!",
-    "axs_background_location_service_text": "Dịch vụ vị trí nền của ví AXS cho các móc Wi-Fi đang hoạt động... .",
-    "axs_background_location_service_title": "Dịch vụ vị trí ví AXS",
+    "moonchain_background_location_service_text": "Dịch vụ vị trí nền của ví Moonchain cho các móc Wi-Fi đang hoạt động... .",
+    "moonchain_background_location_service_title": "Dịch vụ vị trí ví Moonchain",
     "unable_to_retrieve_wifi_info_successfully": "Không thể lấy thông tin wifi thành công!",
     "auto_claim_started": "Bắt đầu Tự động Yêu cầu 🏁",
     "no_miners_selected_notification_title": "Dường như bạn chưa chọn bất kỳ thợ đào nào. ℹ️",
     "no_miners_selected_notification_text": "Vui lòng đến ứng dụng DApp của thợ đào để chọn thợ đào.",
     "auto_claim_successful_notification_title": "Thợ đào tự động yêu cầu thành công ✅",
-    "auto_claim_successful_notification_text": "Ví AXS của bạn đã được yêu cầu thành công, bạn đã khai thác được các token.",
+    "auto_claim_successful_notification_text": "Ví Moonchain của bạn đã được yêu cầu thành công, bạn đã khai thác được các token.",
     "nothing_to_claim_notification_title": "Ồ, Không có gì để yêu cầu ℹ️",
-    "nothing_to_claim_notification_text": "Ví AXS đã cố gắng yêu cầu các token bạn đã khai thác, nhưng không tìm thấy bất kỳ token nào để yêu cầu.",
+    "nothing_to_claim_notification_text": "Ví Moonchain đã cố gắng yêu cầu các token bạn đã khai thác, nhưng không tìm thấy bất kỳ token nào để yêu cầu.",
     "auto_claim_failed": "Việc tự động yêu cầu của người đào thất bại ❌",
     "no_miners_owned_notification": "Có vẻ như ví này không sở hữu bất kỳ thợ đào nào. ℹ️",
     "mining_tokens_from_miner": "Đào token từ Thợ đào #{0}. ⛏️",
@@ -396,9 +396,9 @@
     "tokens_mined_successfully_miner": "Người đào #{0}: Tokens đã được đào thành công. ✅",
     "token_mining_failed": "Người đào mỏ #{0}: Quá trình đào token thất bại. ❌",
     "merkle_proof_error": "Lỗi khi cố gắng xác minh chứng thực Merkle.",
-    "axs_location_permission_use_case": "Ví AXS cần truy cập vào vị trí của bạn để sử dụng các tính năng như Wi-Fi hooks trong khi ứng dụng đang được sử dụng hoặc chạy ở chế độ nền. Dữ liệu vị trí của bạn không được lưu trữ hoặc chia sẻ với bất kỳ bên thứ ba nào.",
-    "axs_camera_permission_use_case": "Ví AXS cần quyền truy cập vào camera của bạn khi ứng dụng đang được sử dụng cho các dịch vụ như đúc RWA. Dữ liệu hình ảnh không được lưu trữ hoặc chia sẻ với bất kỳ bên thứ ba nào.",
-    "axs_photos_permission_use_case": "Ví AXS cần quyền truy cập vào ảnh của bạn để lưu các hình ảnh như RWA. Ảnh của bạn không được lưu hoặc chia sẻ với bất kỳ bên thứ ba nào.",
+    "moonchain_location_permission_use_case": "Ví Moonchain cần truy cập vào vị trí của bạn để sử dụng các tính năng như Wi-Fi hooks trong khi ứng dụng đang được sử dụng hoặc chạy ở chế độ nền. Dữ liệu vị trí của bạn không được lưu trữ hoặc chia sẻ với bất kỳ bên thứ ba nào.",
+    "moonchain_camera_permission_use_case": "Ví Moonchain cần quyền truy cập vào camera của bạn khi ứng dụng đang được sử dụng cho các dịch vụ như đúc RWA. Dữ liệu hình ảnh không được lưu trữ hoặc chia sẻ với bất kỳ bên thứ ba nào.",
+    "moonchain_photos_permission_use_case": "Ví Moonchain cần quyền truy cập vào ảnh của bạn để lưu các hình ảnh như RWA. Ảnh của bạn không được lưu hoặc chia sẻ với bất kỳ bên thứ ba nào.",
     "permission_use_cases": "Các trường hợp sử dụng quyền truy cập",
     "ok_allow": "Được, Cho phép",
     "not_now": "Không phải bây giờ",
@@ -416,7 +416,7 @@
     "local_secured_storage": "Bộ nhớ lưu trữ an toàn cục bộ",
     "save_locally": "Lưu trữ cục bộ",
     "save_locally_description": "Hãy chắc chắn lưu lại khóa của bạn ở cục bộ và sau đó bạn đã sẵn sàng để tiếp tục.",
-    "axs_storage_permission_use_case": "Ví AXS cần quyền truy cập vào bộ nhớ của bạn để sử dụng các tính năng như RWA. Dữ liệu lưu trữ của bạn không được lưu lại hoặc chia sẻ với bất kỳ bên thứ ba nào.",
+    "moonchain_storage_permission_use_case": "Ví Moonchain cần quyền truy cập vào bộ nhớ của bạn để sử dụng các tính năng như RWA. Dữ liệu lưu trữ của bạn không được lưu lại hoặc chia sẻ với bất kỳ bên thứ ba nào.",
     "local_backup": "Sao lưu cục bộ",
     "no_description": "Không mô tả",
     "bluetooth_not_supported": "Bluetooth không được hỗ trợ trên thiết bị này.",
@@ -443,9 +443,9 @@
     "no_rings_selected_notification_title": "Có vẻ như bạn chưa chọn bất kỳ Nhẫn Blueberry nào. ℹ️",
     "no_rings_selected_notification_text": "Vui lòng đến ứng dụng phi tập trung Blueberry Ring để chọn nhẫn.",
     "auto_sync_successful_notification_title": "Thành công trong việc tự động yêu cầu Blueberry Ring ✅",
-    "auto_sync_successful_notification_text": "Ví AXS đã đồng bộ thành công dữ liệu vòng của bạn",
+    "auto_sync_successful_notification_text": "Ví Moonchain đã đồng bộ thành công dữ liệu vòng của bạn",
     "already_synced_notification_title": "Ồ, đã được đồng bộ hóa ℹ️",
-    "already_synced_notification_text": "Ví AXS đã cố gắng đồng bộ dữ liệu vòng của bạn, Nhưng có vẻ như bạn đã đồng bộ dữ liệu vòng hôm nay.",
+    "already_synced_notification_text": "Ví Moonchain đã cố gắng đồng bộ dữ liệu vòng của bạn, Nhưng có vẻ như bạn đã đồng bộ dữ liệu vòng hôm nay.",
     "auto_sync_failed": "Vòng Blueberry tự đồng bộ thất bại ❌",
     "no_rings_owned_notification": "Dường như ví này không sở hữu bất kỳ Blueberry Rings nào. ℹ️",
     "syncing_data_from_ring": "Đồng bộ hóa dữ liệu từ Blueberry Ring #{0}. ⛏️",
@@ -453,5 +453,23 @@
     "data_synced_successfully_ring": "Vòng Blueberry #{0}: Dữ liệu đã được đồng bộ thành công. ✅",
     "data_syncing_failed": "Vòng Blueberry #{0}: Quá trình đồng bộ hóa dữ liệu thất bại. ❌",
     "blueberry_hooks": "Móc Blueberry",
-    "message": "Tin nhắn"
+    "message": "Tin nhắn",
+    "moonchain_username": "Tên người dùng Moonchain",
+    "powered_by_moonchain_supernodes": "Được cung cấp bởi Siêu nút Moonchain",
+    "moonchain_design_documents": "Tài liệu thiết kế Moonchain",
+    "continue_now": "Tiếp tục ngay bây giờ",
+    "you_will_be_directed_to_the_main_app": "Bạn sẽ được chuyển hướng đến ứng dụng chính ",
+    "account_setup_complete": "Thiết lập tài khoản đã hoàn tất!",
+    "entering_the_app": "Đăng nhập vào Ứng dụng",
+    "in": "Đang tải..",
+    "google_drive_secured_storage": "Lưu trữ bảo mật Google Drive",
+    "icloud_secured_storage": "Lưu trữ được bảo mật bởi iCloud",
+    "make_sure_you_have_stored_your_keys_correctly_in_your_x": "Hãy đảm bảo rằng bạn đã lưu trữ khóa của mình một cách chính xác trong {0}",
+    "icloud": "iCloud",
+    "google_drive": "Google Drive",
+    "store_in_x": "Lưu trữ trong {0}",
+    "your_email_address": "Địa chỉ Email của bạn",
+    "invalid_email": "Vui lòng nhập một địa chỉ email hợp lệ (ví dụ: name@example.com)",
+    "email": "Email",
+    "hello": "Xin chào"
 }
\ No newline at end of file
diff --git a/assets/flutter_i18n/zh_CN.json b/assets/flutter_i18n/zh_CN.json
index 76df5729..87ecd7c0 100644
--- a/assets/flutter_i18n/zh_CN.json
+++ b/assets/flutter_i18n/zh_CN.json
@@ -10,11 +10,11 @@
     "confirm_passcode_desc": "重新输入您的密码",
     "secret_recovery_phrase": "恢复密语",
     "import_your_wallet": "导入您的钱包",
-    "word_seed_phrase": "导入您现有的钱包，使用您的12、18或24个词的恢复短语，或者从电子邮件AXS钱包密钥文本文件中下载并粘贴恢复短语在这里。",
+    "word_seed_phrase": "导入您现有的钱包，使用您的12、18或24个词的恢复短语，或者从电子邮件Moonchain钱包密钥文本文件中下载并粘贴恢复短语在这里。",
     "confirm": "确认",
     "choose_my_username": "选择我的用户名",
     "mnemonic_passphrase": "助记词密码",
-    "biometrics_setup": "AXS 生物识别设置",
+    "biometrics_setup": "Moonchain 生物识别设置",
     "mxc_zkevm_username": "MXC zkEVM 用户名",
     "ens_announcement_description": "处理复杂钱包地址的繁琐过程已成为过去。现在，凭借你独一无二的 MXC zkEVM 用户名，你可以轻松使用定制和独特的名称来区别自己。",
     "choose_your_username": "选择你独特的MXC zkEVM用户名",
@@ -41,12 +41,12 @@
     "send": "发送",
     "received": "收到",
     "sent": "已发送",
-    "email_secured_body": "为了保护您的AXS钱包的安全和隐私，您必须严格保密此邮件中的所有信息。\n请仔细按照以下步骤操作：\n1. 确保您是此邮件的唯一收件人，将收件人地址更改为您自己的地址。\n2. 确认正确的电子邮件地址后，点击“发送”按钮将这些重要信息安全地转发给自己。遵守这些措施，您将确保您的AXS钱包的最高安全性。感谢您在此事上的勤勉。",
-    "email_secured_subject": "保护您的AXS钱包密钥 - 重要指示",
+    "email_secured_body": "为了保护您的Moonchain钱包的安全和隐私，您必须严格保密此邮件中的所有信息。\n请仔细按照以下步骤操作：\n1. 确保您是此邮件的唯一收件人，将收件人地址更改为您自己的地址。\n2. 确认正确的电子邮件地址后，点击“发送”按钮将这些重要信息安全地转发给自己。遵守这些措施，您将确保您的Moonchain钱包的最高安全性。感谢您在此事上的勤勉。",
+    "email_secured_subject": "保护您的Moonchain钱包密钥 - 重要指示",
     "face_id": "面部 ID",
     "fingerprint": "指纹",
     "touch_id": "触控ID",
-    "unlock_axs_wallet": "解锁您的AXS钱包",
+    "unlock_moonchain_wallet": "解锁您的Moonchain钱包",
     "enter_your_passcode": "输入您的密码",
     "attempts_x": "{0}次尝试中的第几次",
     "forgot_passcode": "我忘记了我的密码",
@@ -81,7 +81,7 @@
     "use_biometric_or_passcode": "使用您的 {0} 或继续输入密码",
     "use_biometric": "使用 {0}",
     "create_passcode": "创建密码",
-    "skip": "跳过",
+    "skip": "略",
     "domain_registered": "哇，剧情大反转！你梦寐以求的用户名已经被占用了。先别急着庆祝，老铁！",
     "domain_limit": "选择一个3-30个字符的用户名，以避免过长或类似于小说或推文。",
     "domain_invalid": "名称格式无效",
@@ -217,8 +217,8 @@
     "networks": "网络",
     "added": "已添加",
     "want_to_add_this_network": "想要添加这个网络吗？",
-    "network_adding_usage_notice": "添加此网络，允许在AXS中使用",
-    "custom_network_security_alert": "AXS不支持自定义网络或其安全性。",
+    "network_adding_usage_notice": "添加此网络，允许在Moonchain中使用",
+    "custom_network_security_alert": "Moonchain不支持自定义网络或其安全性。",
     "block_explorer_url": "区块浏览器网址",
     "new_network_added": "新网络已添加",
     "x_is_now_available": "\"{0}\"现在可在网络选择器中使用。",
@@ -288,11 +288,11 @@
     "send_&_receive": "发送和接收",
     "contract": "合同",
     "decimals": "小数点",
-    "add_token_success_message": "万岁！代币已成功添加到您的AXS钱包中！🎉",
+    "add_token_success_message": "万岁！代币已成功添加到您的Moonchain钱包中！🎉",
     "import_account": "导入账户",
     "add_account": "添加账户",
     "private_key": "私钥",
-    "import_notice": "导入的账户将不会与您的AXS钱包秘密恢复短语关联。",
+    "import_notice": "导入的账户将不会与您的Moonchain钱包秘密恢复短语关联。",
     "imported": "进口的",
     "view_private_key": "查看私钥",
     "view_private_key_notice": "警告：永远不要泄露这个密钥。任何拥有您的私钥的人都可以窃取您账户中的任何资产。",
@@ -302,8 +302,8 @@
     "duplicate_account_import_notice": "您试图导入的账户是重复的。",
     "unable_to_launch_email_app": "无法启动电子邮件应用程序",
     "max_fee": "最大费用",
-    "deposit_from_exchanges_notice": "从{0}，{1}交易所购买并直接将zkEVM MXC存入AXS钱包",
-    "deposit_with_l3_bridge_notice": "从其他交易所购买并使用{0}将ERC20 MXC存入AXS钱包",
+    "deposit_from_exchanges_notice": "从{0}，{1}交易所购买并直接将zkEVM MXC存入Moonchain钱包",
+    "deposit_with_l3_bridge_notice": "从其他交易所购买并使用{0}将ERC20 MXC存入Moonchain钱包",
     "buy_some_x_for_fee_notice": "购买一些{0}来支付交易的燃气费，通常在网络不忙的时候少于2美元。",
     "insufficient_funds_notice": "此交易余额不足。请添加资金。",
     "contractCall": "合约调用",
@@ -322,8 +322,8 @@
     "gas_fee_replacement_notice": "这个燃气费将替代原来的。",
     "unknown": "未知的",
     "transaction_finalized": "交易已完成",
-    "background_fetch_notice_title": "优化您的AXS钱包体验",
-    "background_fetch_notice_text": "为确保AXS钱包的最佳性能，我们建议您在后台保持应用程序活动，并将其从电池优化设置中排除。这有助于维持无缝功能和对您钱包的不间断访问。",
+    "background_fetch_notice_title": "优化您的Moonchain钱包体验",
+    "background_fetch_notice_text": "为确保Moonchain钱包的最佳性能，我们建议您在后台保持应用程序活动，并将其从电池优化设置中排除。这有助于维持无缝功能和对您钱包的不间断访问。",
     "acknowledge": "确认",
     "background_notifications_service_launched_successfully": "后台通知服务成功启动。",
     "unable_to_launch_background_notification_service": "无法启动后台通知服务。",
@@ -351,7 +351,7 @@
     "auto_claim_execution_dialog_text": "自动索赔的时间已过。您现在想执行自动索赔吗？",
     "execute": "执行",
     "auto_claim_scheduling_text": "自动领取将在明天的{0}执行",
-    "wifi_location_background_fetch_notice_text": "为确保AXS钱包的最佳性能，我们建议您在后台保持应用程序活动，并将其从电池优化设置中排除。这有助于维持无缝功能和对您钱包的不间断访问。请注意，只有WiFi六边形位置挂钩会在后台使用位置服务；应用程序在后台运行时，其他服务不会访问您的位置。",
+    "wifi_location_background_fetch_notice_text": "为确保Moonchain钱包的最佳性能，我们建议您在后台保持应用程序活动，并将其从电池优化设置中排除。这有助于维持无缝功能和对您钱包的不间断访问。请注意，只有WiFi六边形位置挂钩会在后台使用位置服务；应用程序在后台运行时，其他服务不会访问您的位置。",
     "wifi_hexagon_location_hooks": "Wi-Fi六边形位置钩子",
     "mxc_top_up_notification_text": "嘿{0}！你今天在你的钱包中增加了{1} MXC。继续增长吧！",
     "mxc_top_up_notification_title": "恭喜新的充值",
@@ -379,16 +379,16 @@
     "wifi_info_notifications_title": "成功的Wi-Fi交易更新",
     "wifi_info_notifications_text": "您已成功通过向MXC zkEVM提交交易来更新Wi-Fi网络列表。",
     "wifi_info_tx_failed": "糟糕，Wi-Fi交易更新失败了！",
-    "axs_background_location_service_text": "AXS钱包后台位置服务正在运行Wi-Fi挂钩... .",
-    "axs_background_location_service_title": "AXS 钱包位置服务",
+    "moonchain_background_location_service_text": "Moonchain钱包后台位置服务正在运行Wi-Fi挂钩... .",
+    "moonchain_background_location_service_title": "Moonchain 钱包位置服务",
     "unable_to_retrieve_wifi_info_successfully": "无法成功获取wifi信息！",
     "auto_claim_started": "自动索赔开始 🏁",
     "no_miners_selected_notification_title": "看起来您还没有选择任何矿工。ℹ️",
     "no_miners_selected_notification_text": "请前往矿工DApp选择矿工。",
     "auto_claim_successful_notification_title": "矿工自动领取成功✅",
-    "auto_claim_successful_notification_text": "AXS钱包已成功领取你挖掘的代币。",
+    "auto_claim_successful_notification_text": "Moonchain钱包已成功领取你挖掘的代币。",
     "nothing_to_claim_notification_title": "哎呀，没有可领取的 ℹ️",
-    "nothing_to_claim_notification_text": "AXS钱包试图领取你挖矿得到的代币，但并未找到任何可以领取的代币。",
+    "nothing_to_claim_notification_text": "Moonchain钱包试图领取你挖矿得到的代币，但并未找到任何可以领取的代币。",
     "auto_claim_failed": "矿工自动认领失败 ❌",
     "no_miners_owned_notification": "看起来这个钱包并不拥有任何矿工。ℹ️",
     "mining_tokens_from_miner": "从矿工#{0}挖掘代币。⛏️",
@@ -396,9 +396,9 @@
     "tokens_mined_successfully_miner": "矿工 #{0}：代币挖掘成功。✅",
     "token_mining_failed": "矿工#{0}：代币挖矿过程失败。❌",
     "merkle_proof_error": "尝试验证Merkle证明时出错。",
-    "axs_location_permission_use_case": "AXS钱包需要访问您的位置信息，以便在应用程序正在使用或在后台运行时使用诸如Wi-Fi挂钩等功能。您的位置数据不会被保存或与任何第三方共享。",
-    "axs_camera_permission_use_case": "AXS钱包在使用诸如RWA铸币等服务时需要访问您的相机。图像数据不会被保存或与任何第三方共享。",
-    "axs_photos_permission_use_case": "AXS钱包需要访问您的照片以保存如RWA等图片。您的照片不会被保存或与任何第三方共享。",
+    "moonchain_location_permission_use_case": "Moonchain钱包需要访问您的位置信息，以便在应用程序正在使用或在后台运行时使用诸如Wi-Fi挂钩等功能。您的位置数据不会被保存或与任何第三方共享。",
+    "moonchain_camera_permission_use_case": "Moonchain钱包在使用诸如RWA铸币等服务时需要访问您的相机。图像数据不会被保存或与任何第三方共享。",
+    "moonchain_photos_permission_use_case": "Moonchain钱包需要访问您的照片以保存如RWA等图片。您的照片不会被保存或与任何第三方共享。",
     "permission_use_cases": "权限使用案例",
     "ok_allow": "好的，允许",
     "not_now": "现在不",
@@ -416,7 +416,7 @@
     "local_secured_storage": "本地安全存储",
     "save_locally": "在本地保存",
     "save_locally_description": "确保将您的密钥本地保存，然后就可以开始了。",
-    "axs_storage_permission_use_case": "AXS钱包需要访问您的存储空间以使用如RWA等功能。您的存储数据不会被保存或与任何第三方共享。",
+    "moonchain_storage_permission_use_case": "Moonchain钱包需要访问您的存储空间以使用如RWA等功能。您的存储数据不会被保存或与任何第三方共享。",
     "local_backup": "本地备份",
     "no_description": "无描述",
     "bluetooth_not_supported": "这个设备不支持蓝牙。",
@@ -443,9 +443,9 @@
     "no_rings_selected_notification_title": "看起来你还没有选择任何蓝莓环。ℹ️",
     "no_rings_selected_notification_text": "请前往Blueberry Ring DApp选择戒指。",
     "auto_sync_successful_notification_title": "蓝莓环自动领取成功 ✅",
-    "auto_sync_successful_notification_text": "AXS钱包已成功同步您的环数据。",
+    "auto_sync_successful_notification_text": "Moonchain钱包已成功同步您的环数据。",
     "already_synced_notification_title": "哎呀，已经同步ℹ️",
-    "already_synced_notification_text": "AXS钱包试图同步您的环数据，但看起来您今天已经同步了环数据。",
+    "already_synced_notification_text": "Moonchain钱包试图同步您的环数据，但看起来您今天已经同步了环数据。",
     "auto_sync_failed": "蓝莓环自动同步失败 ❌",
     "no_rings_owned_notification": "看起来这个钱包并未拥有任何蓝莓环币。ℹ️",
     "syncing_data_from_ring": "从Blueberry Ring #{0}同步数据。⛏️",
@@ -453,5 +453,23 @@
     "data_synced_successfully_ring": "蓝莓环 # {0}：数据同步成功。✅",
     "data_syncing_failed": "蓝莓环＃{0}：数据同步过程失败。❌",
     "blueberry_hooks": "蓝莓钩子",
-    "message": "消息"
-}
\ No newline at end of file
+    "message": "消息",
+    "moonchain_username": "月链用户名",
+    "powered_by_moonchain_supernodes": "由 Moonchain 超级节点驱动",
+    "moonchain_design_documents": "月链设计文档",
+    "continue_now": "继续现在",
+    "you_will_be_directed_to_the_main_app": "您将被引导至主应用程序",
+    "account_setup_complete": "帐户设置已完成！",
+    "entering_the_app": "进入应用程序",
+    "in": "正在加载..",
+    "google_drive_secured_storage": "谷歌云端硬盘安全存储",
+    "icloud_secured_storage": "iCloud 安全存储 ",
+    "make_sure_you_have_stored_your_keys_correctly_in_your_x": "确保您已将密钥正确存储在您的 {0} 中",
+    "icloud": "iCloud",
+    "google_drive": "谷歌云端硬盘",
+    "store_in_x": "存入 {0}",
+    "your_email_address": "您的电子邮件地址",
+    "invalid_email": "请输入一个有效的电子邮件地址（例如，name@example.com）",
+    "email": "电子邮件",
+    "hello": "你好"
+}
diff --git a/assets/flutter_i18n/zh_TW.json b/assets/flutter_i18n/zh_TW.json
index 295eb9bd..0a77683d 100644
--- a/assets/flutter_i18n/zh_TW.json
+++ b/assets/flutter_i18n/zh_TW.json
@@ -10,11 +10,11 @@
     "confirm_passcode_desc": "重新輸入您的密碼",
     "secret_recovery_phrase": "秘密恢復短語",
     "import_your_wallet": "導入您的錢包",
-    "word_seed_phrase": "將您的現有錢包與您的12、18或24字恢復短語一起導入，或從電子郵件AXS錢包密鑰文本文件下載並在此處粘貼恢復短語。",
+    "word_seed_phrase": "將您的現有錢包與您的12、18或24字恢復短語一起導入，或從電子郵件Moonchain錢包密鑰文本文件下載並在此處粘貼恢復短語。",
     "confirm": "確認",
     "choose_my_username": "選擇我的用戶名",
     "mnemonic_passphrase": "助記密語",
-    "biometrics_setup": "AXS 生物識別設置",
+    "biometrics_setup": "Moonchain 生物識別設置",
     "mxc_zkevm_username": "MXC zkEVM 用戶名",
     "ens_announcement_description": "憑藉您獨特的MXC zkEVM用戶名，處理複雜錢包地址的繁瑣過程已成為過去。現在，您可以毫不費力地使用定制和專屬的名稱來脫穎而出。",
     "choose_your_username": "選擇您獨特的 MXC zkEVM 用戶名",
@@ -41,12 +41,12 @@
     "send": "發送",
     "received": "已收到",
     "sent": "已發送",
-    "email_secured_body": "為了您的AXS錢包的安全和隱私，您必須嚴格保密此電子郵件中包含的所有信息。\n請仔細按照以下步驟操作：\n1. 確保您是此電子郵件的唯一收件人，將收件人地址更換為您自己的地址。\n2. 確認正確的電子郵件地址後，點擊'發送'按鈕將這些重要信息安全地轉發給自己。遵守這些措施，您將確保您的AXS錢包得到最大程度的安全。感謝您在此事上的謹慎。",
-    "email_secured_subject": "確保您的AXS錢包密鑰 - 重要指示",
+    "email_secured_body": "為了您的Moonchain錢包的安全和隱私，您必須嚴格保密此電子郵件中包含的所有信息。\n請仔細按照以下步驟操作：\n1. 確保您是此電子郵件的唯一收件人，將收件人地址更換為您自己的地址。\n2. 確認正確的電子郵件地址後，點擊'發送'按鈕將這些重要信息安全地轉發給自己。遵守這些措施，您將確保您的Moonchain錢包得到最大程度的安全。感謝您在此事上的謹慎。",
+    "email_secured_subject": "確保您的Moonchain錢包密鑰 - 重要指示",
     "face_id": "面部 ID",
     "fingerprint": "指紋",
     "touch_id": "觸控 ID",
-    "unlock_axs_wallet": "解鎖你的 AXS 錢包",
+    "unlock_moonchain_wallet": "解鎖你的 Moonchain 錢包",
     "enter_your_passcode": "輸入您的密碼",
     "attempts_x": "{0}次中的6次嘗試",
     "forgot_passcode": "我忘記了我的密碼",
@@ -217,8 +217,8 @@
     "networks": "網路",
     "added": "已新增",
     "want_to_add_this_network": "想要添加這個網路？",
-    "network_adding_usage_notice": "添加此網路，允許在AXS中使用它",
-    "custom_network_security_alert": "AXS並不支持自定義網絡或其安全性。",
+    "network_adding_usage_notice": "添加此網路，允許在Moonchain中使用它",
+    "custom_network_security_alert": "Moonchain並不支持自定義網絡或其安全性。",
     "block_explorer_url": "區塊鏈瀏覽器網址",
     "new_network_added": "新增網路",
     "x_is_now_available": "\"{0}\"現已在網路選擇器中可用。",
@@ -288,11 +288,11 @@
     "send_&_receive": "發送與接收",
     "contract": "合約",
     "decimals": "小數點",
-    "add_token_success_message": "好極了！代幣已成功添加到您的AXS錢包中！🎉",
+    "add_token_success_message": "好極了！代幣已成功添加到您的Moonchain錢包中！🎉",
     "import_account": "導入帳戶",
     "add_account": "新增帳戶",
     "private_key": "私鑰",
-    "import_notice": "導入的賬戶將不會與您的AXS錢包秘密恢復短語相關聯。",
+    "import_notice": "導入的賬戶將不會與您的Moonchain錢包秘密恢復短語相關聯。",
     "imported": "進口的",
     "view_private_key": "查看私鑰",
     "view_private_key_notice": "警告：絕對不要透露此密鑰。任何持有您的私鑰的人都可以竊取您帳戶中的任何資產。",
@@ -302,8 +302,8 @@
     "duplicate_account_import_notice": "您試圖導入的帳戶是重複的。",
     "unable_to_launch_email_app": "無法啟動電子郵件應用程式",
     "max_fee": "最高費用",
-    "deposit_from_exchanges_notice": "從{0}，{1}交易所購買並直接將zkEVM MXC存入AXS錢包",
-    "deposit_with_l3_bridge_notice": "從其他交易所購買，並使用 {0} 存款 ERC20 MXC 到 AXS 錢包",
+    "deposit_from_exchanges_notice": "從{0}，{1}交易所購買並直接將zkEVM MXC存入Moonchain錢包",
+    "deposit_with_l3_bridge_notice": "從其他交易所購買，並使用 {0} 存款 ERC20 MXC 到 Moonchain 錢包",
     "buy_some_x_for_fee_notice": "購買一些{0}來支付交易的燃氣費，通常在網路不忙碌時少於2美元。",
     "insufficient_funds_notice": "此交易餘額不足。請增加資金。",
     "contractCall": "合約呼叫",
@@ -322,8 +322,8 @@
     "gas_fee_replacement_notice": "這個燃氣費將會取代原本的",
     "unknown": "未知的",
     "transaction_finalized": "交易已完成",
-    "background_fetch_notice_title": "優化您的AXS錢包體驗",
-    "background_fetch_notice_text": "為了確保 AXS 錢包的最佳性能，我們建議您將應用程式保持在背景運行並將其從電池優化設置中排除。這有助於維持無縫功能和對您錢包的不間斷訪問。",
+    "background_fetch_notice_title": "優化您的Moonchain錢包體驗",
+    "background_fetch_notice_text": "為了確保 Moonchain 錢包的最佳性能，我們建議您將應用程式保持在背景運行並將其從電池優化設置中排除。這有助於維持無縫功能和對您錢包的不間斷訪問。",
     "acknowledge": "確認",
     "background_notifications_service_launched_successfully": "背景通知服務成功啟動。",
     "unable_to_launch_background_notification_service": "無法啟動背景通知服務。",
@@ -351,7 +351,7 @@
     "auto_claim_execution_dialog_text": "自動索取的時間已經過去。您現在想要執行自動索取嗎？",
     "execute": "執行",
     "auto_claim_scheduling_text": "自動索取將在明天的{0}執行",
-    "wifi_location_background_fetch_notice_text": "為了確保 AXS 錢包的最佳性能，我們建議您在背景中保持應用程式活躍並將其從電池優化設定中排除。這有助於維持無縫功能和對您錢包的不間斷訪問。請注意，只有 WiFi 六角形位置掛鉤會在背景中使用位置服務；當應用程式在背景中運行時，應用程式內的其他服務將不會訪問您的位置。",
+    "wifi_location_background_fetch_notice_text": "為了確保 Moonchain 錢包的最佳性能，我們建議您在背景中保持應用程式活躍並將其從電池優化設定中排除。這有助於維持無縫功能和對您錢包的不間斷訪問。請注意，只有 WiFi 六角形位置掛鉤會在背景中使用位置服務；當應用程式在背景中運行時，應用程式內的其他服務將不會訪問您的位置。",
     "wifi_hexagon_location_hooks": "Wi-Fi 六角形位置鉤子",
     "mxc_top_up_notification_text": "嘿 {0}！你今天在你的錢包中增加了 {1} MXC。繼續讓它增長吧！",
     "mxc_top_up_notification_title": "恭喜新的充值",
@@ -379,16 +379,16 @@
     "wifi_info_notifications_title": "成功的Wi-Fi交易更新",
     "wifi_info_notifications_text": "您已成功通過向MXC zkEVM提交交易來更新Wi-Fi網絡列表。",
     "wifi_info_tx_failed": "哎呀，Wi-Fi交易更新失敗了！",
-    "axs_background_location_service_text": "AXS 錢包背景位置服務為 Wi-Fi 掛鉤正在運行... .",
-    "axs_background_location_service_title": "AXS 錢包位置服務",
+    "moonchain_background_location_service_text": "Moonchain 錢包背景位置服務為 Wi-Fi 掛鉤正在運行... .",
+    "moonchain_background_location_service_title": "Moonchain 錢包位置服務",
     "unable_to_retrieve_wifi_info_successfully": "無法成功檢索wifi資訊！",
     "auto_claim_started": "自動索賠已開始 🏁",
     "no_miners_selected_notification_title": "看起來您還沒有選擇任何礦工。ℹ️",
     "no_miners_selected_notification_text": "請前往礦工DApp選擇礦工。",
     "auto_claim_successful_notification_title": "礦工自動認領成功 ✅",
-    "auto_claim_successful_notification_text": "AXS 錢包已成功領取您所挖掘的代幣。",
+    "auto_claim_successful_notification_text": "Moonchain 錢包已成功領取您所挖掘的代幣。",
     "nothing_to_claim_notification_title": "哎呀，沒有東西可以領取 ℹ️",
-    "nothing_to_claim_notification_text": "AXS 錢包試圖領取您挖掘的代幣，但並未找到任何可領取的代幣。",
+    "nothing_to_claim_notification_text": "Moonchain 錢包試圖領取您挖掘的代幣，但並未找到任何可領取的代幣。",
     "auto_claim_failed": "礦工自動索取失敗 ❌",
     "no_miners_owned_notification": "看起來這個錢包並不擁有任何礦工。ℹ️",
     "mining_tokens_from_miner": "從礦工#{0}挖掘代幣。⛏️",
@@ -396,9 +396,9 @@
     "tokens_mined_successfully_miner": "礦工 #{0}：成功挖掘代幣。✅",
     "token_mining_failed": "礦工 #{0}：代幣挖掘過程失敗。❌",
     "merkle_proof_error": "嘗試驗證Merkle證明時出錯。",
-    "axs_location_permission_use_case": "AXS錢包需要獲取您的位置信息，以便在應用程序正在使用或在後台運行時使用如Wi-Fi掛鈎等功能。您的位置數據不會被保存或與任何第三方共享。",
-    "axs_camera_permission_use_case": "AXS錢包在使用如RWA鑄幣等服務時，需要訪問您的相機。圖像數據不會被保存或與任何第三方共享。",
-    "axs_photos_permission_use_case": "AXS錢包需要訪問您的照片以保存像RWA這樣的圖像。您的照片不會被保存或與任何第三方共享。",
+    "moonchain_location_permission_use_case": "Moonchain錢包需要獲取您的位置信息，以便在應用程序正在使用或在後台運行時使用如Wi-Fi掛鈎等功能。您的位置數據不會被保存或與任何第三方共享。",
+    "moonchain_camera_permission_use_case": "Moonchain錢包在使用如RWA鑄幣等服務時，需要訪問您的相機。圖像數據不會被保存或與任何第三方共享。",
+    "moonchain_photos_permission_use_case": "Moonchain錢包需要訪問您的照片以保存像RWA這樣的圖像。您的照片不會被保存或與任何第三方共享。",
     "permission_use_cases": "權限使用案例",
     "ok_allow": "好的，允許",
     "not_now": "現在不要",
@@ -416,7 +416,7 @@
     "local_secured_storage": "本地安全儲存",
     "save_locally": "在本地保存",
     "save_locally_description": "確保將您的密鑰本地保存，然後就可以開始了。",
-    "axs_storage_permission_use_case": "AXS錢包需要訪問您的存储空間以使用如RWA等功能。您的存儲數據不會被保存或與任何第三方共享。",
+    "moonchain_storage_permission_use_case": "Moonchain錢包需要訪問您的存储空間以使用如RWA等功能。您的存儲數據不會被保存或與任何第三方共享。",
     "local_backup": "本地備份",
     "no_description": "無描述",
     "bluetooth_not_supported": "此設備不支援藍牙。",
@@ -443,9 +443,9 @@
     "no_rings_selected_notification_title": "看起來您還沒有選擇任何藍莓環。ℹ️",
     "no_rings_selected_notification_text": "請前往Blueberry Ring DApp選擇戒指。",
     "auto_sync_successful_notification_title": "藍莓環自動索取成功 ✅",
-    "auto_sync_successful_notification_text": "AXS 錢包已成功同步您的環數據",
+    "auto_sync_successful_notification_text": "Moonchain 錢包已成功同步您的環數據",
     "already_synced_notification_title": "哎呀，已經同步了ℹ️",
-    "already_synced_notification_text": "AXS錢包嘗試同步您的環形數據，但看起來您今天已經同步了環形數據。",
+    "already_synced_notification_text": "Moonchain錢包嘗試同步您的環形數據，但看起來您今天已經同步了環形數據。",
     "auto_sync_failed": "藍莓環自動同步失敗❌",
     "no_rings_owned_notification": "看起來這個錢包並未擁有任何藍莓環。ℹ️",
     "syncing_data_from_ring": "從Blueberry Ring #{0}同步數據。⛏️",
@@ -453,5 +453,23 @@
     "data_synced_successfully_ring": "藍莓環＃{0}：數據同步成功。✅",
     "data_syncing_failed": "藍莓環＃{0}：數據同步過程失敗。❌",
     "blueberry_hooks": "藍莓鉤子",
-    "message": "訊息"
-}
\ No newline at end of file
+    "message": "訊息",
+    "moonchain_username": "月鏈用户名",
+    "powered_by_moonchain_supernodes": "由 Moonchain 超级节点驱动",
+    "moonchain_design_documents": "月鏈設計文件",
+    "continue_now": "繼續",
+    "you_will_be_directed_to_the_main_app": "您將被引導至主應用程式",
+    "account_setup_complete": "帳戶設定已完成！",
+    "entering_the_app": "進入應用程式",
+    "in": "載入中..",
+    "google_drive_secured_storage": "Google 雲端硬碟安全儲存空間",
+    "icloud_secured_storage": "iCloud 安全儲存空間",
+    "make_sure_you_have_stored_your_keys_correctly_in_your_x": "請確保您已將您的金鑰正確儲存在您的 {0} 中",
+    "icloud": "iCloud",
+    "google_drive": "Google 雲端硬碟",
+    "store_in_x": "儲存在 {0} 中",
+    "your_email_address": "您的電子郵件地址",
+    "invalid_email": "請輸入有效的電子郵件地址（例如：name@example.com）",
+    "email": "電子郵件",
+    "hello": "您好"
+}
diff --git a/assets/icons/app_logo.png b/assets/icons/app_logo.png
new file mode 100644
index 00000000..21c820b6
Binary files /dev/null and b/assets/icons/app_logo.png differ
diff --git a/assets/icons/axs.png b/assets/icons/axs.png
deleted file mode 100644
index 4c7863d8..00000000
Binary files a/assets/icons/axs.png and /dev/null differ
diff --git a/assets/icons/mxc-icons.ttf b/assets/icons/mxc-icons.ttf
index a0d72aea..a57e72e3 100755
Binary files a/assets/icons/mxc-icons.ttf and b/assets/icons/mxc-icons.ttf differ
diff --git a/assets/image/miners/miner_skin_camo.webp b/assets/image/miners/miner_skin_camo.webp
new file mode 100644
index 00000000..fa006635
Binary files /dev/null and b/assets/image/miners/miner_skin_camo.webp differ
diff --git a/assets/image/miners/miner_skin_halloween.webp b/assets/image/miners/miner_skin_halloween.webp
new file mode 100644
index 00000000..29113a6d
Binary files /dev/null and b/assets/image/miners/miner_skin_halloween.webp differ
diff --git a/assets/image/miners/miner_skin_lava.webp b/assets/image/miners/miner_skin_lava.webp
new file mode 100644
index 00000000..1865fb48
Binary files /dev/null and b/assets/image/miners/miner_skin_lava.webp differ
diff --git a/assets/image/miners/miner_skin_m2pro.webp b/assets/image/miners/miner_skin_m2pro.webp
new file mode 100644
index 00000000..a922b5f5
Binary files /dev/null and b/assets/image/miners/miner_skin_m2pro.webp differ
diff --git a/assets/image/miners/miner_skin_neo.webp b/assets/image/miners/miner_skin_neo.webp
new file mode 100644
index 00000000..96bf796b
Binary files /dev/null and b/assets/image/miners/miner_skin_neo.webp differ
diff --git a/assets/images/security/unlock.png b/assets/images/security/unlock.png
deleted file mode 100644
index 3eca0264..00000000
Binary files a/assets/images/security/unlock.png and /dev/null differ
diff --git a/assets/pdf/privacy.pdf b/assets/pdf/privacy.pdf
index 386d1591..86172156 100644
Binary files a/assets/pdf/privacy.pdf and b/assets/pdf/privacy.pdf differ
diff --git a/assets/svg/drop_down.svg b/assets/svg/drop_down.svg
deleted file mode 100644
index 849a447f..00000000
--- a/assets/svg/drop_down.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="16" height="20" viewBox="0 0 16 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.27225 15.2725L0.973927 3.818L13.5706 3.818L7.27225 15.2725Z" fill="#6300FF"/>
-<path d="M1.31443 8.62251L7.18879 18.7972L13.0632 8.6225" stroke="#F43178"/>
-</svg>
diff --git a/assets/svg/right_arrow.svg b/assets/svg/right_arrow.svg
deleted file mode 100644
index 6c0173d5..00000000
--- a/assets/svg/right_arrow.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="27" height="16" viewBox="0 0 27 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M26.7071 8.70711C27.0976 8.31658 27.0976 7.68342 26.7071 7.29289L20.3431 0.928932C19.9526 0.538408 19.3195 0.538408 18.9289 0.928932C18.5384 1.31946 18.5384 1.95262 18.9289 2.34315L24.5858 8L18.9289 13.6569C18.5384 14.0474 18.5384 14.6805 18.9289 15.0711C19.3195 15.4616 19.9526 15.4616 20.3431 15.0711L26.7071 8.70711ZM0 9H26V7H0V9Z" fill="white"/>
-</svg>
diff --git a/assets/svg/splash/ic_warning.svg b/assets/svg/splash/ic_warning.svg
new file mode 100644
index 00000000..c0e8588d
--- /dev/null
+++ b/assets/svg/splash/ic_warning.svg
@@ -0,0 +1,3 @@
+<svg width="33" height="29" viewBox="0 0 33 29" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16.5001 0.166745C17.3751 0.166745 18.1876 0.666745 18.6251 1.41675L32.1251 24.4167C32.5626 25.2292 32.5626 26.1667 32.1251 26.9167C31.6876 27.7292 30.8751 28.1667 30.0001 28.1667H3.00012C2.06262 28.1667 1.25012 27.7292 0.812622 26.9167C0.375122 26.1667 0.375122 25.2292 0.812622 24.4167L14.3126 1.41675C14.7501 0.666745 15.5626 0.166745 16.5001 0.166745ZM16.5001 8.16675C15.6251 8.16675 15.0001 8.85425 15.0001 9.66675V16.6667C15.0001 17.5417 15.6251 18.1667 16.5001 18.1667C17.3126 18.1667 18.0001 17.5417 18.0001 16.6667V9.66675C18.0001 8.85425 17.3126 8.16675 16.5001 8.16675ZM18.5001 22.1667C18.5001 21.1042 17.5626 20.1667 16.5001 20.1667C15.3751 20.1667 14.5001 21.1042 14.5001 22.1667C14.5001 23.2917 15.3751 24.1667 16.5001 24.1667C17.5626 24.1667 18.5001 23.2917 18.5001 22.1667Z" fill="#FFD60A"/>
+</svg>
diff --git a/flutter_launcher_icons.yaml b/flutter_launcher_icons.yaml
deleted file mode 100644
index 3e276209..00000000
--- a/flutter_launcher_icons.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-# flutter pub run flutter_launcher_icons:main - flutter_launcher_icons.yaml
-flutter_icons:
-  android: "launcher_icon"
-  ios: true
-  image_path: "assets/icons/axs.png"
-  min_sdk_android: 21
-  remove_alpha_ios: true
diff --git a/ios/GithubActionsExportOptions.plist b/ios/GithubActionsExportOptions.plist
new file mode 100644
index 00000000..7217d922
--- /dev/null
+++ b/ios/GithubActionsExportOptions.plist
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>destination</key>
+	<string>export</string>
+	<key>generateAppStoreInformation</key>
+	<false/>
+	<key>manageAppVersionAndBuildNumber</key>
+	<true/>
+	<key>method</key>
+	<string>app-store</string>
+	<key>signingStyle</key>
+	<string>manual</string>
+  <key>provisioningProfiles</key>
+  <dict>
+    <key>com.mxc.moonchainWallet</key>
+    <string>MoonchainWalletProvisioningProfile</string>
+  </dict>
+	<key>stripSwiftSymbols</key>
+	<true/>
+	<key>teamID</key>
+	<string>WA3C8L5PJX</string>
+	<key>testFlightInternalTestingOnly</key>
+	<false/>
+	<key>uploadSymbols</key>
+	<true/>
+</dict>
+</plist>
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index f50f1348..0949cb9a 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -365,9 +365,11 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = WA3C8L5PJX;
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = WA3C8L5PJX;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -375,9 +377,10 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.mxc.axswallet;
+				PRODUCT_BUNDLE_IDENTIFIER = com.mxc.moonchainWallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "";
+				PROVISIONING_PROFILE_SPECIFIER = "MoonchainWalletProvisioningProfile";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = MoonchainWalletProvisioningProfile;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -501,9 +504,11 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = WA3C8L5PJX;
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = WA3C8L5PJX;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -511,9 +516,10 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.mxc.axswallet;
+				PRODUCT_BUNDLE_IDENTIFIER = com.mxc.moonchainWallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = MoonchainWalletProvisioningProfile;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -529,9 +535,11 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = WA3C8L5PJX;
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = WA3C8L5PJX;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -539,9 +547,10 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.mxc.axswallet;
+				PRODUCT_BUNDLE_IDENTIFIER = com.mxc.moonchainWallet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = MoonchainWalletProvisioningProfile;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20@2x.png
new file mode 100755
index 00000000..63b06973
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20@2x~ipad.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20@2x~ipad.png
new file mode 100755
index 00000000..63b06973
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20@2x~ipad.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20@3x.png
new file mode 100755
index 00000000..ee228f0e
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20~ipad.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20~ipad.png
new file mode 100755
index 00000000..96ff5036
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-20~ipad.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29.png
new file mode 100755
index 00000000..e687beef
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29@2x.png
new file mode 100755
index 00000000..9c6b957c
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29@2x~ipad.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29@2x~ipad.png
new file mode 100755
index 00000000..9c6b957c
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29@2x~ipad.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29@3x.png
new file mode 100755
index 00000000..aeb5a9b3
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29~ipad.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29~ipad.png
new file mode 100755
index 00000000..e687beef
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-29~ipad.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40@2x.png
new file mode 100755
index 00000000..e372d3ff
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40@2x~ipad.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40@2x~ipad.png
new file mode 100755
index 00000000..e372d3ff
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40@2x~ipad.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40@3x.png
new file mode 100755
index 00000000..524be529
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40~ipad.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40~ipad.png
new file mode 100755
index 00000000..63b06973
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-40~ipad.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-60@2x~car.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-60@2x~car.png
new file mode 100755
index 00000000..524be529
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-60@2x~car.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-60@3x~car.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-60@3x~car.png
new file mode 100755
index 00000000..9e672d58
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-60@3x~car.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-83.5@2x~ipad.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-83.5@2x~ipad.png
new file mode 100755
index 00000000..63969ae3
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon-83.5@2x~ipad.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon@2x.png
new file mode 100755
index 00000000..524be529
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon@2x~ipad.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon@2x~ipad.png
new file mode 100755
index 00000000..f30ab60e
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon@2x~ipad.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon@3x.png
new file mode 100755
index 00000000..9e672d58
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon~ios-marketing.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon~ios-marketing.png
new file mode 100755
index 00000000..3efd50da
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon~ios-marketing.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon~ipad.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon~ipad.png
new file mode 100755
index 00000000..4752dcd8
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/AppIcon~ipad.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
old mode 100644
new mode 100755
index d36b1fab..bd04914a
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,122 +1,134 @@
 {
-  "images" : [
+  "images": [
     {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
+      "filename": "AppIcon@2x.png",
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "60x60"
     },
     {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@3x.png",
-      "scale" : "3x"
+      "filename": "AppIcon@3x.png",
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "60x60"
     },
     {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
+      "filename": "AppIcon~ipad.png",
+      "idiom": "ipad",
+      "scale": "1x",
+      "size": "76x76"
     },
     {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
+      "filename": "AppIcon@2x~ipad.png",
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "76x76"
     },
     {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@3x.png",
-      "scale" : "3x"
+      "filename": "AppIcon-83.5@2x~ipad.png",
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "83.5x83.5"
     },
     {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
+      "filename": "AppIcon-40@2x.png",
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "40x40"
     },
     {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@3x.png",
-      "scale" : "3x"
+      "filename": "AppIcon-40@3x.png",
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "40x40"
     },
     {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@2x.png",
-      "scale" : "2x"
+      "filename": "AppIcon-40~ipad.png",
+      "idiom": "ipad",
+      "scale": "1x",
+      "size": "40x40"
     },
     {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@3x.png",
-      "scale" : "3x"
+      "filename": "AppIcon-40@2x~ipad.png",
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "40x40"
     },
     {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@1x.png",
-      "scale" : "1x"
+      "filename": "AppIcon-20@2x.png",
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "20x20"
     },
     {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
+      "filename": "AppIcon-20@3x.png",
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "20x20"
     },
     {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
+      "filename": "AppIcon-20~ipad.png",
+      "idiom": "ipad",
+      "scale": "1x",
+      "size": "20x20"
     },
     {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
+      "filename": "AppIcon-20@2x~ipad.png",
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "20x20"
     },
     {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@1x.png",
-      "scale" : "1x"
+      "filename": "AppIcon-29.png",
+      "idiom": "iphone",
+      "scale": "1x",
+      "size": "29x29"
     },
     {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
+      "filename": "AppIcon-29@2x.png",
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "29x29"
     },
     {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@1x.png",
-      "scale" : "1x"
+      "filename": "AppIcon-29@3x.png",
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "29x29"
     },
     {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@2x.png",
-      "scale" : "2x"
+      "filename": "AppIcon-29~ipad.png",
+      "idiom": "ipad",
+      "scale": "1x",
+      "size": "29x29"
     },
     {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "scale" : "2x"
+      "filename": "AppIcon-29@2x~ipad.png",
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "29x29"
     },
     {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "Icon-App-1024x1024@1x.png",
-      "scale" : "1x"
+      "filename": "AppIcon-60@2x~car.png",
+      "idiom": "car",
+      "scale": "2x",
+      "size": "60x60"
+    },
+    {
+      "filename": "AppIcon-60@3x~car.png",
+      "idiom": "car",
+      "scale": "3x",
+      "size": "60x60"
+    },
+    {
+      "filename": "AppIcon~ios-marketing.png",
+      "idiom": "ios-marketing",
+      "scale": "1x",
+      "size": "1024x1024"
     }
   ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
+  "info": {
+    "author": "iconkitchen",
+    "version": 1
   }
-}
+}
\ No newline at end of file
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
deleted file mode 100644
index c3251266..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
deleted file mode 100644
index 960728c4..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
deleted file mode 100644
index 6f42986a..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
deleted file mode 100644
index 119287bf..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
deleted file mode 100644
index d3476b80..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
deleted file mode 100644
index ba108575..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
deleted file mode 100644
index e5c4017b..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
deleted file mode 100644
index 6f42986a..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
deleted file mode 100644
index f7c6263c..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
deleted file mode 100644
index fec410df..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
deleted file mode 100644
index fec410df..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
deleted file mode 100644
index f1b0a451..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
deleted file mode 100644
index c7064108..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
deleted file mode 100644
index 15986f8c..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and /dev/null differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
deleted file mode 100644
index 530d6fa5..00000000
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and /dev/null differ
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 9c2bab40..6555c743 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -5,17 +5,17 @@
 	<key>BGTaskSchedulerPermittedIdentifiers</key>
 	<array>
 		<string>com.transistorsoft.fetch</string>
-		<string>com.mxc.axswallet.notificationsTask</string>
-		<string>com.mxc.axswallet.wifiHooksTask</string>
-		<string>com.mxc.axswallet.minerAutoClaimTask</string>
-		<string>com.mxc.axswallet.blueberryAutoSyncTask</string>
+		<string>com.mxc.moonchainWallet.notificationsTask</string>
+		<string>com.mxc.moonchainWallet.wifiHooksTask</string>
+		<string>com.mxc.moonchainWallet.minerAutoClaimTask</string>
+		<string>com.mxc.moonchainWallet.blueberryAutoSyncTask</string>
 	</array>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>AXS</string>
+	<string>MoonBase</string>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>
@@ -59,7 +59,7 @@
 		<string>fr</string>
 	</array>
 	<key>CFBundleName</key>
-	<string>axs</string>
+	<string>moonchain</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
@@ -93,35 +93,35 @@
 		<true/>
 	</dict>
 	<key>NSAppleMusicUsageDescription</key>
-	<string>Would you allow AXS Wallet to use the Media Library?</string>
+	<string>Would you allow Moonchain Wallet to use the Media Library?</string>
+	<key>NSBluetoothAlwaysUsageDescription</key>
+	<string>Moonchain Wallet needs access to your Bluetooth when the app is in use  or running in the background for services such as BluberryRing. Blutooth data is not saved or shared with any third parties.</string>
 	<key>NSBluetoothPeripheralUsageDescription</key>
-	<string>Would you allow AXS Wallet to use the Bluetooth?</string>
+	<string>Would you allow Moonchain Wallet to use the Bluetooth?</string>
 	<key>NSCalendarsUsageDescription</key>
-	<string>Would you allow AXS Wallet to use the Calendar?</string>
+	<string>Would you allow Moonchain Wallet to use the Calendar?</string>
 	<key>NSCameraUsageDescription</key>
-	<string>AXS Wallet needs access to your camera when the app is in use for services such as RWA minting. Image data is not saved or shared with any third parties.</string>
+	<string>Moonchain Wallet needs access to your camera when the app is in use for services such as RWA minting. Image data is not saved or shared with any third parties.</string>
 	<key>NSFaceIDUsageDescription</key>
-	<string>AXS Wallet needs access to your Biometric data when the app is in use for authentication only. Your Biometric data is not saved or shared with any third parties.</string>
+	<string>Moonchain Wallet needs access to your Biometric data when the app is in use for authentication only. Your Biometric data is not saved or shared with any third parties.</string>
 	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-	<string>AXS Wallet needs access to your location for features such as Wi-Fi hooks while the app is in use or running in the background. Your location data is not saved or shared with any third parties.</string>
+	<string>Moonchain Wallet needs access to your location for features such as Wi-Fi hooks while the app is in use or running in the background. Your location data is not saved or shared with any third parties.</string>
 	<key>NSLocationAlwaysUsageDescription</key>
-	<string>AXS Wallet requires access to your location at all times for services such as Wi-Fi hooks. Your location data is not saved or shared with any third parties.</string>
+	<string>Moonchain Wallet requires access to your location at all times for services such as Wi-Fi hooks. Your location data is not saved or shared with any third parties.</string>
 	<key>NSLocationUsageDescription</key>
-	<string>AXS Wallet needs access to your location to provide services such as Wi-Fi hooks. Your location data is not saved or shared with any third parties.</string>
+	<string>Moonchain Wallet needs access to your location to provide services such as Wi-Fi hooks. Your location data is not saved or shared with any third parties.</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>AXS Wallet needs access to your location when the app is in use for services such as Wi-Fi hooks. Your location data is not saved or shared with any third parties.</string>
+	<string>Moonchain Wallet needs access to your location when the app is in use for services such as Wi-Fi hooks. Your location data is not saved or shared with any third parties.</string>
 	<key>NSMotionUsageDescription</key>
-	<string>Would you allow AXS Wallet to use the Motion?</string>
+	<string>Would you allow Moonchain Wallet to use the Motion?</string>
 	<key>NSPhotoLibraryAddUsageDescription</key>
-	<string>AXS Wallet needs access to your photos to save images such as RWA. Your photos are not saved or shared with any third parties.</string>
+	<string>Moonchain Wallet needs access to your photos to save images such as RWA. Your photos are not saved or shared with any third parties.</string>
 	<key>NSPhotoLibraryUsageDescription</key>
-	<string>AXS Wallet needs access to your photos when the app is in use for services such as RWA minting. Your photos are not saved or shared with any third parties.</string>
+	<string>Moonchain Wallet needs access to your photos when the app is in use for services such as RWA minting. Your photos are not saved or shared with any third parties.</string>
 	<key>NSSpeechRecognitionUsageDescription</key>
-	<string>Would you allow AXS Wallet to use the Speech Recognition?</string>
+	<string>Would you allow Moonchain Wallet to use the Speech Recognition?</string>
 	<key>PermissionGroupNotification</key>
-	<string>Would you allow AXS Wallet to use the Notification?</string>
-	<key>NSBluetoothAlwaysUsageDescription</key>
-	<string>AXS Wallet needs access to your Bluetooth when the app is in use  or running in the background for services such as BluberryRing. Blutooth data is not saved or shared with any third parties.</string>
+	<string>Would you allow Moonchain Wallet to use the Notification?</string>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
 	<key>UIBackgroundModes</key>
@@ -149,9 +149,9 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
 	<key>UISupportsDocumentBrowser</key>
 	<true/>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
 </dict>
 </plist>
diff --git a/lib/app/app.dart b/lib/app/app.dart
index 79912243..c1666011 100644
--- a/lib/app/app.dart
+++ b/lib/app/app.dart
@@ -1,22 +1,22 @@
-import 'package:datadashwallet/app/app_presenter.dart';
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/dapps/dapps.dart';
-import 'package:datadashwallet/features/errors/network_unavailable/network_unavailable.dart';
-import 'package:datadashwallet/features/file_listener/file_listener_wrapper.dart';
-import 'package:datadashwallet/features/security/security.dart';
-import 'package:datadashwallet/features/splash/splash.dart';
+import 'package:moonchain_wallet/app/app_presenter.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/dapps/dapps.dart';
+import 'package:moonchain_wallet/features/errors/network_unavailable/network_unavailable.dart';
+import 'package:moonchain_wallet/features/file_listener/file_listener_wrapper.dart';
+import 'package:moonchain_wallet/features/security/security.dart';
+import 'package:moonchain_wallet/features/splash/splash.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:datadashwallet/features/settings/settings.dart';
+import 'package:moonchain_wallet/features/settings/settings.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 
 final appNavigatorKey = GlobalKey<NavigatorState>();
 
-class AxsWallet extends HookConsumerWidget {
-  const AxsWallet({
+class MXCWallet extends HookConsumerWidget {
+  const MXCWallet({
     Key? key,
     required this.isLoggedIn,
   }) : super(key: key);
diff --git a/lib/app/app_presenter.dart b/lib/app/app_presenter.dart
index eeefb6a0..e773ff19 100644
--- a/lib/app/app_presenter.dart
+++ b/lib/app/app_presenter.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 
 final appContainer =
     PresenterContainer<SettingsPresenter, void>(() => SettingsPresenter());
@@ -9,6 +9,6 @@ class SettingsPresenter extends CompletePresenter {
   @override
   void initState() {
     super.initState();
-    AXSFireBase.initLocalNotificationsAndListeners();
+    MoonchainWalletFireBase.initLocalNotificationsAndListeners();
   }
 }
diff --git a/lib/common/assets.dart b/lib/common/assets.dart
index c031c5c4..5859fc11 100644
--- a/lib/common/assets.dart
+++ b/lib/common/assets.dart
@@ -1,3 +1,2 @@
 class Assets {
-  static const String mxcLogoUri = 'assets/svg/networks/mxc.svg';
 }
diff --git a/lib/common/bottom_sheets/base_bottom_sheet.dart b/lib/common/bottom_sheets/base_bottom_sheet.dart
new file mode 100644
index 00000000..1ebe6e9b
--- /dev/null
+++ b/lib/common/bottom_sheets/base_bottom_sheet.dart
@@ -0,0 +1,74 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_i18n/flutter_i18n.dart';
+import 'package:mxc_ui/mxc_ui.dart';
+
+Future<T?> showBaseBottomSheet<T>({
+  required BuildContext context,
+  bool hasCloseButton = true,
+  bool? closeButtonReturnValue,
+
+  /// Has translation so just pass the key
+  String? bottomSheetTitle,
+  List<Widget>? widgets,
+  Widget? content,
+}) {
+  assert(
+      ((widgets != null && bottomSheetTitle != null) || content != null) &&
+          (!((widgets != null && bottomSheetTitle != null) && content != null)),
+      "Only one of content or widgets should be specified.");
+  String translate(String text) => FlutterI18n.translate(context, text);
+
+  return showModalBottomSheet<T>(
+    context: context,
+    useRootNavigator: true,
+    isScrollControlled: true,
+    backgroundColor: Colors.transparent,
+    useSafeArea: true,
+    builder: (BuildContext context) => ConstrainedBox(
+      constraints: BoxConstraints(
+        maxHeight: MediaQuery.of(context).size.height * 0.95,
+      ),
+      child: Container(
+        padding: const EdgeInsets.only(
+            top: 0,
+            bottom: Sizes.space3XLarge,
+            right: Sizes.spaceNormal,
+            left: Sizes.spaceNormal),
+        decoration: BoxDecoration(
+          color: ColorsTheme.of(context).layerSheetBackground,
+          borderRadius: const BorderRadius.only(
+            topLeft: Radius.circular(20),
+            topRight: Radius.circular(20),
+          ),
+        ),
+        child: content ??
+            Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Padding(
+                  padding: const EdgeInsetsDirectional.only(
+                      start: Sizes.spaceNormal,
+                      end: Sizes.spaceNormal,
+                      bottom: Sizes.space2XLarge),
+                  child: MxcAppBarEvenly.title(
+                    titleText: translate(bottomSheetTitle!),
+                    action: hasCloseButton
+                        ? Container(
+                            alignment: Alignment.centerRight,
+                            child: InkWell(
+                              child: const Icon(Icons.close, size: 30),
+                              onTap: () => Navigator.of(context)
+                                  .pop(closeButtonReturnValue),
+                            ),
+                          )
+                        : null,
+                  ),
+                ),
+                ...widgets!
+              ],
+            ),
+      ),
+    ),
+  );
+}
diff --git a/lib/common/bottom_sheets/blueberry_rings_bottom_sheet.dart b/lib/common/bottom_sheets/blueberry_rings_bottom_sheet.dart
index 0f4edd62..4ffbe473 100644
--- a/lib/common/bottom_sheets/blueberry_rings_bottom_sheet.dart
+++ b/lib/common/bottom_sheets/blueberry_rings_bottom_sheet.dart
@@ -1,4 +1,5 @@
-import 'package:datadashwallet/features/dapps/subfeatures/open_dapp/widgets/widgets.dart';
+import 'package:moonchain_wallet/common/bottom_sheets/bottom_sheets.dart';
+import 'package:moonchain_wallet/features/dapps/subfeatures/open_dapp/widgets/widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
@@ -7,45 +8,24 @@ import 'package:mxc_ui/mxc_ui.dart';
 Future<ScanResult?> showBlueberryRingsBottomSheet(
   BuildContext context,
 ) {
-  return showModalBottomSheet<ScanResult?>(
+  return showBaseBottomSheet<ScanResult>(
     context: context,
-    useRootNavigator: true,
-    isScrollControlled: true,
-    isDismissible: false,
-    useSafeArea: true,
-    backgroundColor: Colors.transparent,
-    builder: (BuildContext context) => StatefulBuilder(
-      builder: (BuildContext context, setState) {
-        return Container(
-          padding:
-              const EdgeInsets.only(left: 16, right: 16, top: 0, bottom: 44),
-          decoration: BoxDecoration(
-            color: ColorsTheme.of(context).screenBackground,
-            borderRadius: const BorderRadius.only(
-              topLeft: Radius.circular(20),
-              topRight: Radius.circular(20),
+    content: Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        MxcAppBarEvenly.title(
+          titleText: FlutterI18n.translate(context, 'nearby_blueberry_rings'),
+          action: Container(
+            alignment: Alignment.centerRight,
+            child: InkWell(
+              child: const Icon(Icons.close),
+              onTap: () => Navigator.of(context).pop(null),
             ),
           ),
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              MxcAppBarEvenly.title(
-                titleText:
-                    FlutterI18n.translate(context, 'nearby_blueberry_rings'),
-                action: Container(
-                  alignment: Alignment.centerRight,
-                  child: InkWell(
-                    child: const Icon(Icons.close),
-                    onTap: () => Navigator.of(context).pop(null),
-                  ),
-                ),
-              ),
-              const BlueberryDeviceInfo(),
-              const SizedBox(height: 10),
-            ],
-          ),
-        );
-      },
+        ),
+        const BlueberryDeviceInfo(),
+        const SizedBox(height: 10),
+      ],
     ),
   );
 }
diff --git a/lib/common/bottom_sheets/bottom_sheets.dart b/lib/common/bottom_sheets/bottom_sheets.dart
index 642f3154..b986653c 100644
--- a/lib/common/bottom_sheets/bottom_sheets.dart
+++ b/lib/common/bottom_sheets/bottom_sheets.dart
@@ -1 +1,2 @@
 export 'blueberry_rings_bottom_sheet.dart';
+export 'base_bottom_sheet.dart';
diff --git a/lib/common/common.dart b/lib/common/common.dart
index a336f1ee..30b1f62d 100644
--- a/lib/common/common.dart
+++ b/lib/common/common.dart
@@ -11,3 +11,4 @@ export 'components/components.dart';
 export 'dialogs/dialogs.dart';
 export 'assets.dart';
 export 'bottom_sheets/bottom_sheets.dart';
+export 'ui_config.dart';
diff --git a/lib/common/components/balance_panel/domain/balance_repository.dart b/lib/common/components/balance_panel/domain/balance_repository.dart
index dfcf0560..b517503e 100644
--- a/lib/common/components/balance_panel/domain/balance_repository.dart
+++ b/lib/common/components/balance_panel/domain/balance_repository.dart
@@ -1,5 +1,5 @@
 import 'package:mxc_logic/mxc_logic.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 
 class BalanceRepository extends ControlledCacheRepository {
   @override
diff --git a/lib/common/components/balance_panel/domain/balance_use_case.dart b/lib/common/components/balance_panel/domain/balance_use_case.dart
index 11fbb051..f71a218a 100644
--- a/lib/common/components/balance_panel/domain/balance_use_case.dart
+++ b/lib/common/components/balance_panel/domain/balance_use_case.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
 import 'balance_repository.dart';
diff --git a/lib/common/components/balance_panel/presentation/balance_panel.dart b/lib/common/components/balance_panel/presentation/balance_panel.dart
index 69d4e592..f8bd8a55 100644
--- a/lib/common/components/balance_panel/presentation/balance_panel.dart
+++ b/lib/common/components/balance_panel/presentation/balance_panel.dart
@@ -1,7 +1,7 @@
-import 'package:datadashwallet/common/components/balance_panel/widgets/balance_chart.dart';
-import 'package:datadashwallet/common/components/balance_panel/widgets/balance_in_xsd.dart';
-import 'package:datadashwallet/common/components/balance_panel/widgets/balance_title.dart';
-import 'package:datadashwallet/common/components/balance_panel/widgets/manage_portfolio_section.dart';
+import 'package:moonchain_wallet/common/components/balance_panel/widgets/balance_chart.dart';
+import 'package:moonchain_wallet/common/components/balance_panel/widgets/balance_in_xsd.dart';
+import 'package:moonchain_wallet/common/components/balance_panel/widgets/balance_title.dart';
+import 'package:moonchain_wallet/common/components/balance_panel/widgets/manage_portfolio_section.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:mxc_ui/mxc_ui.dart';
diff --git a/lib/common/components/balance_panel/widgets/balance_chart.dart b/lib/common/components/balance_panel/widgets/balance_chart.dart
index 314d5bf4..87ecc252 100644
--- a/lib/common/components/balance_panel/widgets/balance_chart.dart
+++ b/lib/common/components/balance_panel/widgets/balance_chart.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/features/wallet/wallet.dart';
+import 'package:moonchain_wallet/features/wallet/wallet.dart';
 import 'package:dotted_line/dotted_line.dart';
 import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/common/components/balance_panel/widgets/balance_in_xsd.dart b/lib/common/components/balance_panel/widgets/balance_in_xsd.dart
index da390ce2..4898e386 100644
--- a/lib/common/components/balance_panel/widgets/balance_in_xsd.dart
+++ b/lib/common/components/balance_panel/widgets/balance_in_xsd.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/wallet/wallet.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/wallet/wallet.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:mxc_logic/mxc_logic.dart';
diff --git a/lib/common/components/balance_panel/widgets/balance_title.dart b/lib/common/components/balance_panel/widgets/balance_title.dart
index b153ea88..1a2d25a7 100644
--- a/lib/common/components/balance_panel/widgets/balance_title.dart
+++ b/lib/common/components/balance_panel/widgets/balance_title.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/features/wallet/wallet.dart';
+import 'package:moonchain_wallet/features/wallet/wallet.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
diff --git a/lib/common/components/balance_panel/widgets/change_indicator.dart b/lib/common/components/balance_panel/widgets/change_indicator.dart
index fefa5afc..36336920 100644
--- a/lib/common/components/balance_panel/widgets/change_indicator.dart
+++ b/lib/common/components/balance_panel/widgets/change_indicator.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/features/wallet/wallet.dart';
+import 'package:moonchain_wallet/features/wallet/wallet.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -31,7 +31,7 @@ class ChangeIndicator extends HookConsumerWidget {
                               ? MxcIcons.decrease
                               : MxcIcons.increase,
                           color: state.changeIndicator!.isNegative
-                              ? ColorsTheme.of(context).systemStatusInActive
+                              ? ColorsTheme.of(context).saturatedRed
                               : ColorsTheme.of(context).systemStatusActive,
                           size: 16,
                         ),
@@ -39,32 +39,33 @@ class ChangeIndicator extends HookConsumerWidget {
                 width: 4,
               ),
               Text(
-                  '${state.changeIndicator == 0.0 ? 0 : state.changeIndicator!.toStringAsFixed(2)}%',
-                  style: FontTheme.of(context).h7().copyWith(
-                        foreground: state.hideBalance == true
-                            ? (Paint()
-                              ..style = PaintingStyle.fill
-                              ..color = Colors.white
-                              ..maskFilter =
-                                  const MaskFilter.blur(BlurStyle.normal, 6))
-                            : null,
-                        color: state.hideBalance == true
-                            ? null
-                            : state.changeIndicator == 0.0
-                                ? ColorsTheme.of(context).textSecondary
-                                : state.changeIndicator!.isNegative
-                                    ? ColorsTheme.of(context)
-                                        .systemStatusInActive
-                                    : ColorsTheme.of(context)
-                                        .systemStatusActive,
-                      )),
+                '${state.changeIndicator == 0.0 ? 0 : state.changeIndicator!.toStringAsFixed(2)}%',
+                style: FontTheme.of(context).h7().copyWith(
+                      foreground: state.hideBalance == true
+                          ? (Paint()
+                            ..style = PaintingStyle.fill
+                            ..color = Colors.white
+                            ..maskFilter =
+                                const MaskFilter.blur(BlurStyle.normal, 6))
+                          : null,
+                      color: state.hideBalance == true
+                          ? null
+                          : state.changeIndicator == 0.0
+                              ? ColorsTheme.of(context).textSecondary
+                              : state.changeIndicator!.isNegative
+                                  ? ColorsTheme.of(context).saturatedRed
+                                  : ColorsTheme.of(context).systemStatusActive,
+                    ),
+              ),
               const SizedBox(
                 width: 4,
               ),
-              Text(FlutterI18n.translate(context, 'today'),
-                  style: FontTheme.of(context)
-                      .caption1()
-                      .copyWith(color: ColorsTheme.of(context).textSecondary)),
+              Text(
+                FlutterI18n.translate(context, 'today'),
+                style: FontTheme.of(context)
+                    .caption1()
+                    .copyWith(color: ColorsTheme.of(context).textSecondary),
+              ),
             ],
           )
         : Container();
diff --git a/lib/common/components/balance_panel/widgets/manage_portfolio_section.dart b/lib/common/components/balance_panel/widgets/manage_portfolio_section.dart
index 238f0579..bf1efb96 100644
--- a/lib/common/components/balance_panel/widgets/manage_portfolio_section.dart
+++ b/lib/common/components/balance_panel/widgets/manage_portfolio_section.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/portfolio/presentation/portfolio_page.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/portfolio/presentation/portfolio_page.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
diff --git a/lib/common/components/components.dart b/lib/common/components/components.dart
index c7ecee0f..35fa5eeb 100644
--- a/lib/common/components/components.dart
+++ b/lib/common/components/components.dart
@@ -2,7 +2,7 @@ export 'recent_transactions/recent_transactions.dart';
 export 'gradient_text.dart';
 export 'grey_container.dart';
 export 'balance_panel/balance.dart';
-export 'snack_bar.dart';
+export 'snackbar/snackbar.dart';
 export 'list/list.dart';
 export 'property_item.dart';
 export 'notification.dart';
diff --git a/lib/common/components/grey_container.dart b/lib/common/components/grey_container.dart
index e68e23a7..5b0906fd 100644
--- a/lib/common/components/grey_container.dart
+++ b/lib/common/components/grey_container.dart
@@ -17,7 +17,7 @@ class GreyContainer extends StatelessWidget {
       width: width,
       padding: padding ?? const EdgeInsets.all(0),
       decoration: BoxDecoration(
-          color: ColorsTheme.of(context).cardBackground,
+          color: ColorsTheme.of(context).layerSheetBackground,
           borderRadius: const BorderRadius.all(Radius.circular(10))),
       child: child,
     );
diff --git a/lib/common/components/list/single_line_info_item.dart b/lib/common/components/list/single_line_info_item.dart
index 0b9f6b29..e8cb4694 100644
--- a/lib/common/components/list/single_line_info_item.dart
+++ b/lib/common/components/list/single_line_info_item.dart
@@ -1,22 +1,25 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/src/providers/providers_use_cases.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/src/providers/providers_use_cases.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 
 class SingleLineInfoItem extends HookConsumerWidget {
-  const SingleLineInfoItem(
-      {super.key,
-      required this.title,
-      required this.value,
-      this.hint,
-      this.valueActionIcon});
+  const SingleLineInfoItem({
+    super.key,
+    required this.title,
+    required this.value,
+    this.hint,
+    this.valueActionIcon,
+    this.valueAlign = TextAlign.end,
+  });
 
   final String title;
   final String value;
   final String? hint;
   final Widget? valueActionIcon;
+  final TextAlign valueAlign;
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -26,9 +29,10 @@ class SingleLineInfoItem extends HookConsumerWidget {
     return Padding(
       padding: const EdgeInsets.symmetric(vertical: Sizes.spaceXSmall),
       child: Row(
+        crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          Row(
-            mainAxisAlignment: MainAxisAlignment.start,
+          Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               Text(
                 FlutterI18n.translate(context, title),
@@ -37,19 +41,21 @@ class SingleLineInfoItem extends HookConsumerWidget {
               const SizedBox(width: 10),
             ],
           ),
+          const SizedBox(width: 10),
           Expanded(
+            flex: 4,
             child: InkWell(
               onTap:
                   isAddress ? () => launcherUseCase.viewAddress(value) : null,
               child: Row(
-                mainAxisAlignment: MainAxisAlignment.end,
+                // mainAxisAlignment: MainAxisAlignment.end,
                 children: [
                   Expanded(
                     child: Text(
                       value,
                       style: FontTheme.of(context).body1.primary(),
                       softWrap: true,
-                      textAlign: TextAlign.start,
+                      textAlign: valueAlign,
                     ),
                   ),
                   if (valueActionIcon != null)
diff --git a/lib/common/components/notification.dart b/lib/common/components/notification.dart
index 56668ca2..461d26bc 100644
--- a/lib/common/components/notification.dart
+++ b/lib/common/components/notification.dart
@@ -1,9 +1,9 @@
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 
 showNotification(String title, String? text) {
-  AXSNotification().showNotification(title, text);
+  MoonchainWalletNotification().showNotification(title, text);
 }
 
 showLowPriorityNotification(String title, String? text) {
-  AXSNotification().showLowPriorityNotification(title, text);
+  MoonchainWalletNotification().showLowPriorityNotification(title, text);
 }
diff --git a/lib/common/components/recent_transactions/domain/mxc_transaction_use_case.dart b/lib/common/components/recent_transactions/domain/mxc_transaction_use_case.dart
index 3e058b7c..c6b44b1d 100644
--- a/lib/common/components/recent_transactions/domain/mxc_transaction_use_case.dart
+++ b/lib/common/components/recent_transactions/domain/mxc_transaction_use_case.dart
@@ -1,7 +1,7 @@
 import 'package:collection/collection.dart';
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'package:web3dart/web3dart.dart';
 
diff --git a/lib/common/components/recent_transactions/domain/transactions_history_repository.dart b/lib/common/components/recent_transactions/domain/transactions_history_repository.dart
index ff39cda5..23d2dd5a 100644
--- a/lib/common/components/recent_transactions/domain/transactions_history_repository.dart
+++ b/lib/common/components/recent_transactions/domain/transactions_history_repository.dart
@@ -1,5 +1,5 @@
 import 'package:mxc_logic/mxc_logic.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 
 class TransactionsHistoryRepository extends ControlledCacheRepository {
   @override
diff --git a/lib/common/components/recent_transactions/domain/transactions_history_use_case.dart b/lib/common/components/recent_transactions/domain/transactions_history_use_case.dart
index 0b4c4e1b..d044e537 100644
--- a/lib/common/components/recent_transactions/domain/transactions_history_use_case.dart
+++ b/lib/common/components/recent_transactions/domain/transactions_history_use_case.dart
@@ -1,8 +1,8 @@
 import 'dart:async';
 
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/subfeatures/chain_configuration/domain/chain_configuration_use_case.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/chain_configuration/domain/chain_configuration_use_case.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'package:web3dart/web3dart.dart';
 
diff --git a/lib/common/components/recent_transactions/recent_transactions.dart b/lib/common/components/recent_transactions/recent_transactions.dart
index 6de85146..8f57a7b4 100644
--- a/lib/common/components/recent_transactions/recent_transactions.dart
+++ b/lib/common/components/recent_transactions/recent_transactions.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/features/wallet/wallet.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/features/wallet/wallet.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import './utils.dart';
 import 'package:flutter/material.dart';
@@ -56,11 +56,12 @@ class RecentTransactions extends HookConsumerWidget {
           height: Sizes.spaceSmall,
         ),
         MxcChipButton(
-            key: const Key('viewOtherTransactions'),
-            title: FlutterI18n.translate(context, 'view_other_transactions'),
-            iconData: MxcIcons.external_link,
-            alignIconStart: false,
-            onTap: () => presenter.getViewOtherTransactionsLink()),
+          key: const Key('viewOtherTransactions'),
+          title: FlutterI18n.translate(context, 'view_other_transactions'),
+          iconData: MxcIcons.external_link,
+          alignIconStart: false,
+          onTap: () => presenter.getViewOtherTransactionsLink(),
+        ),
       ],
     );
   }
diff --git a/lib/common/components/recent_transactions/utils.dart b/lib/common/components/recent_transactions/utils.dart
index d4747519..c81815d2 100644
--- a/lib/common/components/recent_transactions/utils.dart
+++ b/lib/common/components/recent_transactions/utils.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/common/components/recent_transactions/widgets/recent_transaction_item.dart';
+import 'package:moonchain_wallet/common/components/recent_transactions/widgets/recent_transaction_item.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_logic/mxc_logic.dart';
@@ -21,7 +21,7 @@ class RecentTransactionsUtils {
     late Color txColor;
     switch (transactionType) {
       case TransactionType.sent:
-        txColor = ColorsTheme.of(context).mainRed;
+        txColor = ColorsTheme.of(context).saturatedRed;
         break;
       case TransactionType.received:
         txColor = ColorsTheme.of(context).greenMain;
@@ -30,7 +30,7 @@ class RecentTransactionsUtils {
         txColor = ColorsTheme.of(context).textGrey1;
         break;
       default:
-        txColor = ColorsTheme.of(context).mainRed;
+        txColor = ColorsTheme.of(context).saturatedRed;
     }
     return txColor;
   }
@@ -61,10 +61,10 @@ class RecentTransactionsUtils {
         txColor = ColorsTheme.of(context).textOrange;
         break;
       case TransactionStatus.failed:
-        txColor = ColorsTheme.of(context).mainRed;
+        txColor = ColorsTheme.of(context).saturatedRed;
         break;
       default:
-        txColor = ColorsTheme.of(context).mainRed;
+        txColor = ColorsTheme.of(context).saturatedRed;
     }
     return txColor;
   }
diff --git a/lib/common/components/recent_transactions/widgets/cancel_bottom_sheet.dart b/lib/common/components/recent_transactions/widgets/cancel_bottom_sheet.dart
index 053cd213..cd36b6ec 100644
--- a/lib/common/components/recent_transactions/widgets/cancel_bottom_sheet.dart
+++ b/lib/common/components/recent_transactions/widgets/cancel_bottom_sheet.dart
@@ -1,3 +1,4 @@
+import 'package:moonchain_wallet/common/bottom_sheets/bottom_sheets.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_ui/mxc_ui.dart';
@@ -8,42 +9,27 @@ Future<bool?> showCancelDialog(BuildContext context,
         {required String estimatedFee,
         required String maxFee,
         required String symbol}) =>
-    showModalBottomSheet<bool>(
+    showBaseBottomSheet<bool>(
       context: context,
-      useRootNavigator: true,
-      isScrollControlled: true,
-      isDismissible: true,
-      useSafeArea: true,
-      backgroundColor: Colors.transparent,
-      builder: (BuildContext context) => Container(
-        padding: const EdgeInsets.only(left: 16, right: 16, top: 0, bottom: 44),
-        decoration: BoxDecoration(
-          color: ColorsTheme.of(context).screenBackground,
-          borderRadius: const BorderRadius.only(
-            topLeft: Radius.circular(20),
-            topRight: Radius.circular(20),
-          ),
-        ),
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            MxcAppBarEvenly.title(
-              titleText: FlutterI18n.translate(context, 'cancel'),
-              action: Container(
-                alignment: Alignment.centerRight,
-                child: InkWell(
-                  child: const Icon(Icons.close),
-                  onTap: () => Navigator.of(context).pop(false),
-                ),
+      content: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          MxcAppBarEvenly.title(
+            titleText: FlutterI18n.translate(context, 'cancel'),
+            action: Container(
+              alignment: Alignment.centerRight,
+              child: InkWell(
+                child: const Icon(Icons.close),
+                onTap: () => Navigator.of(context).pop(false),
               ),
             ),
-            SpeedUpCancelBottomSheetInfo(
-              estimatedFee: estimatedFee,
-              maxFee: maxFee,
-              symbol: symbol,
-            ),
-            const SizedBox(height: 10),
-          ],
-        ),
+          ),
+          SpeedUpCancelBottomSheetInfo(
+            estimatedFee: estimatedFee,
+            maxFee: maxFee,
+            symbol: symbol,
+          ),
+          const SizedBox(height: 10),
+        ],
       ),
     );
diff --git a/lib/common/components/recent_transactions/widgets/recent_transaction_item.dart b/lib/common/components/recent_transactions/widgets/recent_transaction_item.dart
index ae2d7dab..d539a1c0 100644
--- a/lib/common/components/recent_transactions/widgets/recent_transaction_item.dart
+++ b/lib/common/components/recent_transactions/widgets/recent_transaction_item.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/features/wallet/wallet.dart';
+import 'package:moonchain_wallet/features/wallet/wallet.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import './transaction_status_chip.dart';
 import './transaction_type_widget.dart';
diff --git a/lib/common/components/recent_transactions/widgets/speed_up_bottom_sheet.dart b/lib/common/components/recent_transactions/widgets/speed_up_bottom_sheet.dart
index 791ea30f..4d1ba1a3 100644
--- a/lib/common/components/recent_transactions/widgets/speed_up_bottom_sheet.dart
+++ b/lib/common/components/recent_transactions/widgets/speed_up_bottom_sheet.dart
@@ -1,3 +1,4 @@
+import 'package:moonchain_wallet/common/bottom_sheets/bottom_sheets.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_ui/mxc_ui.dart';
@@ -8,42 +9,27 @@ Future<bool?> showSpeedUpDialog(BuildContext context,
         {required String estimatedFee,
         required String maxFee,
         required String symbol}) =>
-    showModalBottomSheet<bool>(
+    showBaseBottomSheet<bool>(
       context: context,
-      useRootNavigator: true,
-      isScrollControlled: true,
-      isDismissible: true,
-      useSafeArea: true,
-      backgroundColor: Colors.transparent,
-      builder: (BuildContext context) => Container(
-        padding: const EdgeInsets.only(left: 16, right: 16, top: 0, bottom: 44),
-        decoration: BoxDecoration(
-          color: ColorsTheme.of(context).screenBackground,
-          borderRadius: const BorderRadius.only(
-            topLeft: Radius.circular(20),
-            topRight: Radius.circular(20),
-          ),
-        ),
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            MxcAppBarEvenly.title(
-              titleText: FlutterI18n.translate(context, 'speed_up'),
-              action: Container(
-                alignment: Alignment.centerRight,
-                child: InkWell(
-                  child: const Icon(Icons.close),
-                  onTap: () => Navigator.of(context).pop(false),
-                ),
+      content: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          MxcAppBarEvenly.title(
+            titleText: FlutterI18n.translate(context, 'speed_up'),
+            action: Container(
+              alignment: Alignment.centerRight,
+              child: InkWell(
+                child: const Icon(Icons.close),
+                onTap: () => Navigator.of(context).pop(false),
               ),
             ),
-            SpeedUpCancelBottomSheetInfo(
-              estimatedFee: estimatedFee,
-              maxFee: maxFee,
-              symbol: symbol,
-            ),
-            const SizedBox(height: 10),
-          ],
-        ),
+          ),
+          SpeedUpCancelBottomSheetInfo(
+            estimatedFee: estimatedFee,
+            maxFee: maxFee,
+            symbol: symbol,
+          ),
+          const SizedBox(height: 10),
+        ],
       ),
     );
diff --git a/lib/common/components/recent_transactions/widgets/speed_up_cancel_bottom_sheet_info.dart b/lib/common/components/recent_transactions/widgets/speed_up_cancel_bottom_sheet_info.dart
index 769688aa..44744e81 100644
--- a/lib/common/components/recent_transactions/widgets/speed_up_cancel_bottom_sheet_info.dart
+++ b/lib/common/components/recent_transactions/widgets/speed_up_cancel_bottom_sheet_info.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -52,11 +52,11 @@ class SpeedUpCancelBottomSheetInfo extends ConsumerWidget {
 
   Widget submitButton(BuildContext context) {
     String titleText = 'submit';
-    AxsButtonType type = AxsButtonType.primary;
+    MXCWalletButtonType type = MXCWalletButtonType.primary;
 
     return MxcButton.primary(
       key: const ValueKey('submitButton'),
-      size: AxsButtonSize.xl,
+      size: MXCWalletButtonSize.xl,
       title: FlutterI18n.translate(context, titleText),
       type: type,
       onTap: () {
diff --git a/lib/common/components/shape_border.dart b/lib/common/components/shape_border.dart
new file mode 100644
index 00000000..21eb4c23
--- /dev/null
+++ b/lib/common/components/shape_border.dart
@@ -0,0 +1,76 @@
+import 'package:flutter/material.dart';
+
+class RoundedBottomBorder extends ShapeBorder {
+  final BorderSide bottomBorder;
+
+  RoundedBottomBorder({required this.bottomBorder});
+
+  @override
+  EdgeInsetsGeometry get dimensions => EdgeInsets.only(bottom: bottomBorder.width);
+
+  @override
+  Path getOuterPath(Rect rect, {TextDirection? textDirection}) {
+    return Path()
+      ..addRRect(RRect.fromRectAndRadius(
+        rect,
+        const Radius.circular(8),
+      ));
+  }
+
+  @override
+  void paint(Canvas canvas, Rect rect, {TextDirection? textDirection}) {
+    // Deflate the rectangle by the border width to draw the border from the inside
+    final deflatedRect = rect.deflate(bottomBorder.width / 2);
+    final rrect = RRect.fromRectAndRadius(
+      deflatedRect,
+      const Radius.circular(8),
+    );
+
+    // final paint = Paint()
+    //   ..color = bottomBorder.color
+    //   ..style = PaintingStyle.stroke
+    //   ..strokeCap = StrokeCap.round
+    //   ..strokeWidth = bottomBorder.width + 4;
+
+    // final path = Path()
+    //   ..moveTo(deflatedRect.left, deflatedRect.bottom - 4)
+    //   ..lineTo(deflatedRect.right, deflatedRect.bottom - 4);
+
+    // Draw the border only on the path, which is now inside the original bounds
+    // canvas.drawPath(path, paint);
+  }
+
+  @override
+  ShapeBorder scale(double t) => RoundedBottomBorder(
+        bottomBorder: bottomBorder.scale(t),
+      );
+
+  @override
+  ShapeBorder lerpFrom(ShapeBorder? a, double t) {
+    if (a is RoundedBottomBorder) {
+      return RoundedBottomBorder(
+        bottomBorder: BorderSide.lerp(a.bottomBorder, bottomBorder, t),
+      );
+    }
+    return super.lerpFrom(a, t)!;
+  }
+
+  @override
+  ShapeBorder lerpTo(ShapeBorder? b, double t) {
+    if (b is RoundedBottomBorder) {
+      return RoundedBottomBorder(
+        bottomBorder: BorderSide.lerp(bottomBorder, b.bottomBorder, t),
+      );
+    }
+    return super.lerpTo(b, t)!;
+  }
+
+  @override
+  Path getInnerPath(Rect rect, {TextDirection? textDirection}) {
+    return Path()
+      ..addRRect(RRect.fromRectAndRadius(
+        rect.deflate(bottomBorder.width),
+        const Radius.circular(8),
+      ));
+  }
+}
\ No newline at end of file
diff --git a/lib/common/components/snack_bar.dart b/lib/common/components/snack_bar.dart
deleted file mode 100644
index a0e828a2..00000000
--- a/lib/common/components/snack_bar.dart
+++ /dev/null
@@ -1,64 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:mxc_ui/mxc_ui.dart';
-
-enum SnackBarType { success, fail, warning }
-
-void showSnackBar({
-  required BuildContext context,
-  required String content,
-  SnackBarType? type = SnackBarType.success,
-  SnackBarAction? action,
-}) {
-  Color getColor() {
-    switch (type) {
-      case SnackBarType.success:
-        return ColorsTheme.of(context, listen: false).systemStatusActive;
-      case SnackBarType.fail:
-        return ColorsTheme.of(context, listen: false).systemStatusInActive;
-      default:
-        return ColorsTheme.of(context, listen: false).systemStatusNotCritical;
-    }
-  }
-
-  final snackBar = SnackBar(
-    elevation: 1000,
-    shape: const RoundedRectangleBorder(
-      borderRadius: BorderRadius.all(Radius.circular(8)),
-    ),
-    margin: EdgeInsets.only(
-      left: Sizes.spaceNormal,
-      right: Sizes.spaceNormal,
-      bottom: SnackBarType.warning == type
-          ? MediaQuery.of(context).size.height - 250
-          : 0,
-    ),
-    padding: const EdgeInsets.all(Sizes.spaceXSmall),
-    backgroundColor: getColor(),
-    content: Row(
-      children: [
-        if (SnackBarType.warning != type)
-          Icon(
-            SnackBarType.success == type
-                ? Icons.check_circle_rounded
-                : Icons.warning_rounded,
-            color: ColorsTheme.of(context, listen: false).iconBlack200,
-            size: 20,
-          ),
-        const SizedBox(width: Sizes.space2XSmall),
-        Expanded(
-          child: Text(
-            content,
-            style: FontTheme.of(context, listen: false).body1().copyWith(
-                color: ColorsTheme.of(context, listen: false).snackbarText),
-            textAlign: TextAlign.start,
-            softWrap: true,
-          ),
-        ),
-      ],
-    ),
-    behavior: SnackBarBehavior.floating,
-    action: action,
-  );
-  ScaffoldMessenger.of(context).clearSnackBars();
-  ScaffoldMessenger.of(context).showSnackBar(snackBar);
-}
diff --git a/lib/common/components/snackbar/linear_bar_animation.dart b/lib/common/components/snackbar/linear_bar_animation.dart
new file mode 100644
index 00000000..a56866b8
--- /dev/null
+++ b/lib/common/components/snackbar/linear_bar_animation.dart
@@ -0,0 +1,62 @@
+import 'package:flutter/material.dart';
+
+class LinearBarAnimation extends StatefulWidget {
+  final Color color;
+  const LinearBarAnimation({super.key, required this.color});
+
+  @override
+  State<LinearBarAnimation> createState() => _LinearBarAnimationState();
+}
+
+class _LinearBarAnimationState extends State<LinearBarAnimation>
+    with TickerProviderStateMixin {
+  late AnimationController _controller;
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = AnimationController(
+      vsync: this,
+      duration: const Duration(milliseconds: 4500),
+      upperBound: 1,
+      lowerBound: 0,
+      value: 0,
+    );
+
+    _controller.forward();
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Positioned(
+      bottom: 0,
+      child: AnimatedBuilder(
+        animation: _controller,
+        builder: (context, child) {
+          return Container(
+            height: 2,
+            width: _controller.value *
+                MediaQuery.of(
+                  context,
+                ).size.width,
+            decoration: BoxDecoration(
+              boxShadow: [
+                BoxShadow(
+                  color: widget.color,
+                  blurRadius: 1,
+                  spreadRadius: 1.0,
+                ),
+              ],
+            ),
+          );
+        },
+      ),
+    );
+  }
+}
diff --git a/lib/common/components/snackbar/snackbar.dart b/lib/common/components/snackbar/snackbar.dart
new file mode 100644
index 00000000..a3a44866
--- /dev/null
+++ b/lib/common/components/snackbar/snackbar.dart
@@ -0,0 +1,221 @@
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:flutter/material.dart';
+import 'package:mxc_ui/mxc_ui.dart';
+
+import 'linear_bar_animation.dart';
+
+enum SnackBarType { success, fail, warning }
+
+enum SnackBarPosition {
+  top,
+  bottom,
+}
+
+void showSnackBar({
+  required BuildContext context,
+  required String content,
+  String? title,
+  SnackBarType? type = SnackBarType.success,
+  String? buttonTitle,
+  void Function()? buttonOnTap,
+  SnackBarPosition? snackBarPosition,
+  action,
+}) {
+  if (buttonOnTap != null || buttonTitle != null) {
+    assert(buttonOnTap != null && buttonTitle != null,
+        'Button onTap & title should both be specified if one of them is specified.');
+  }
+
+  final isTitleAvailable = title != null;
+
+  Color getColor() {
+    switch (type) {
+      case SnackBarType.success:
+        return ColorsTheme.of(context, listen: false).greenSuccess;
+      case SnackBarType.fail:
+        return ColorsTheme.of(context, listen: false).error;
+      case SnackBarType.warning:
+        return ColorsTheme.of(context, listen: false).warning;
+      default:
+        return ColorsTheme.of(context, listen: false).warning;
+    }
+  }
+
+  Color getShadowColor() {
+    switch (type) {
+      case SnackBarType.success:
+        return ColorsTheme.of(
+          context,
+          listen: false,
+        ).successShadow;
+      case SnackBarType.fail:
+        return ColorsTheme.of(
+          context,
+          listen: false,
+        ).errorShadow;
+      case SnackBarType.warning:
+        return ColorsTheme.of(
+          context,
+          listen: false,
+        ).warningShadow;
+      default:
+        return ColorsTheme.of(
+          context,
+          listen: false,
+        ).warningShadow;
+    }
+  }
+
+  TextStyle getContentStyle() {
+    if (isTitleAvailable) {
+      return FontTheme.of(
+        context,
+        listen: false,
+      ).caption1().copyWith(
+            color: ColorsTheme.of(context, listen: false).lightGray,
+          );
+    } else {
+      return FontTheme.of(
+        context,
+        listen: false,
+      ).body1().copyWith(
+            color: ColorsTheme.of(context, listen: false).white,
+          );
+    }
+  }
+
+  final snackBar = SnackBar(
+    elevation: 1000,
+    shape: const RoundedRectangleBorder(
+      borderRadius: BorderRadius.all(Radius.circular(8)),
+    ),
+    margin: EdgeInsets.only(
+      left: Sizes.spaceNormal,
+      right: Sizes.spaceNormal,
+      bottom: SnackBarPosition.top == snackBarPosition
+          ? MediaQuery.of(
+                context,
+              ).size.height -
+              250
+          : 0,
+    ),
+    duration: const Duration(seconds: 4),
+    padding: const EdgeInsets.all(0),
+    backgroundColor: const Color(0XFF202020),
+    content: ClipRRect(
+      borderRadius: UIConfig.defaultBorderRadiusAll,
+      child: Stack(
+        fit: StackFit.passthrough,
+        children: [
+          Positioned(
+            left: -106 + Sizes.spaceXSmall,
+            top: -80 + Sizes.spaceXSmall,
+            child: Container(
+              width: 212,
+              height: 212,
+              decoration: BoxDecoration(
+                shape: BoxShape.circle,
+                gradient: RadialGradient(
+                  colors: [
+                    getShadowColor().withOpacity(0.21),
+                    getShadowColor().withOpacity(0),
+                  ],
+                  tileMode: TileMode.clamp,
+                ),
+              ),
+            ),
+          ),
+          LinearBarAnimation(color: getColor()),
+          Padding(
+            padding: const EdgeInsets.all(Sizes.spaceXSmall),
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.start,
+              children: [
+                Container(
+                  padding: const EdgeInsets.all(Sizes.spaceXSmall),
+                  decoration: BoxDecoration(
+                    shape: BoxShape.circle,
+                    color: Color(0xFF303746).withOpacity(0.5),
+                  ),
+                  child: Center(
+                    child: Icon(
+                      SnackBarType.success == type
+                          ? MxcIcons.check_mark
+                          : SnackBarType.fail == type
+                              ? Icons.cancel_sharp
+                              : MxcIcons.warning_1,
+                      color: getColor(),
+                      size: 20,
+                    ),
+                  ),
+                ),
+                const SizedBox(width: Sizes.spaceXSmall),
+                Expanded(
+                  child: Padding(
+                    padding:
+                        const EdgeInsets.symmetric(vertical: Sizes.spaceXSmall),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        isTitleAvailable
+                            ? Text(
+                                title,
+                                style: FontTheme.of(
+                                  context,
+                                  listen: false,
+                                ).subtitle2().copyWith(
+                                      color:
+                                          ColorsTheme.of(context, listen: false)
+                                              .white,
+                                    ),
+                                textAlign: TextAlign.start,
+                                softWrap: true,
+                              )
+                            : Container(),
+                        Text(
+                          content,
+                          style: getContentStyle(),
+                          textAlign: TextAlign.start,
+                          softWrap: true,
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+                if (buttonTitle != null && buttonOnTap != null) ...[
+                  Container(
+                    alignment: AlignmentDirectional.centerEnd,
+                    width: MediaQuery.of(
+                          context,
+                        ).size.width *
+                        0.15,
+                    child: Center(
+                      child: GestureDetector(
+                        onTap: () {
+                          buttonOnTap();
+                        },
+                        child: Text(
+                          buttonTitle,
+                          style: FontTheme.of(context, listen: false)
+                              .subtitle1()
+                              .copyWith(
+                                color: getColor().withOpacity(0.4),
+                              ),
+                        ),
+                      ),
+                    ),
+                  )
+                ] else
+                  Container()
+              ],
+            ),
+          ),
+        ],
+      ),
+    ),
+    behavior: SnackBarBehavior.floating,
+  );
+
+  ScaffoldMessenger.of(context).clearSnackBars();
+  ScaffoldMessenger.of(context).showSnackBar(snackBar);
+}
diff --git a/lib/common/dialogs/add_network/add_network_dialog.dart b/lib/common/dialogs/add_network/add_network_dialog.dart
index 1e6f040b..e037abd9 100644
--- a/lib/common/dialogs/add_network/add_network_dialog.dart
+++ b/lib/common/dialogs/add_network/add_network_dialog.dart
@@ -1,7 +1,6 @@
-import 'package:mxc_logic/src/domain/entities/network.dart';
-import 'package:datadashwallet/features/settings/subfeatures/chain_configuration/subfeatures/add_network/widgets/switch_network_dialog.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
+import 'package:mxc_logic/mxc_logic.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 
 import '../../common.dart';
@@ -13,117 +12,101 @@ Future<bool?> showAddNetworkDialog(
 }) {
   String translate(String text) => FlutterI18n.translate(context, text);
 
-  return showModalBottomSheet<bool>(
+  return showBaseBottomSheet<bool>(
     context: context,
-    useRootNavigator: true,
-    isScrollControlled: true,
-    backgroundColor: Colors.transparent,
-    useSafeArea: true,
-    builder: (BuildContext context) => Container(
-      padding: const EdgeInsets.only(
-          top: Sizes.spaceNormal, bottom: Sizes.space3XLarge),
-      decoration: BoxDecoration(
-        color: ColorsTheme.of(context).layerSheetBackground,
-        borderRadius: const BorderRadius.only(
-          topLeft: Radius.circular(20),
-          topRight: Radius.circular(20),
+    content: Column(
+      mainAxisSize: MainAxisSize.min,
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Padding(
+          padding: const EdgeInsetsDirectional.only(
+              start: Sizes.spaceNormal,
+              end: Sizes.spaceNormal,
+              bottom: Sizes.space2XLarge),
+          child: MxcAppBarEvenly.title(
+            titleText: network.label ?? network.web3RpcHttpUrl,
+          ),
         ),
-      ),
-      child: Padding(
-        padding: const EdgeInsetsDirectional.symmetric(
-          horizontal: Sizes.spaceXLarge,
-        ),
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          crossAxisAlignment: CrossAxisAlignment.start,
+        Column(
+          crossAxisAlignment: CrossAxisAlignment.center,
           children: [
-            Padding(
-              padding: const EdgeInsetsDirectional.only(
-                  start: Sizes.spaceNormal,
-                  end: Sizes.spaceNormal,
-                  bottom: Sizes.space2XLarge),
-              child: MxcAppBarEvenly.title(
-                titleText: network.label ?? network.web3RpcHttpUrl,
+            Text(
+              translate(
+                'want_to_add_this_network',
               ),
-            ),
-            Column(
-              crossAxisAlignment: CrossAxisAlignment.center,
-              children: [
-                Text(
-                  translate(
-                    'want_to_add_this_network',
-                  ),
-                  style: FontTheme.of(context)
-                      .body2
-                      .primary()
-                      .copyWith(fontWeight: FontWeight.w600),
-                ),
-                const SizedBox(
-                  height: Sizes.spaceXSmall,
-                ),
-                Text(
-                  translate(
-                    'network_adding_usage_notice',
-                  ),
-                  style: FontTheme.of(context).body2.primary(),
-                  textAlign: TextAlign.center,
-                ),
-                const SizedBox(
-                  height: Sizes.spaceXSmall,
-                ),
-                network.networkType == NetworkType.custom
-                    ? Text(
-                        translate(
-                          'custom_network_security_alert',
-                        ),
-                        style: FontTheme.of(context).body1().copyWith(
-                            color: ColorsTheme.of(context).textCritical),
-                        textAlign: TextAlign.center,
-                      )
-                    : Container()
-              ],
+              style: FontTheme.of(context, listen: false)
+                  .body2
+                  .primary()
+                  .copyWith(fontWeight: FontWeight.w600),
             ),
             const SizedBox(
               height: Sizes.spaceXSmall,
             ),
-            PropertyItem(
-                title: translate('network_name'),
-                value: network.label ?? network.web3RpcHttpUrl),
-            PropertyItem(
-                title: translate('rpc_url'), value: network.web3RpcHttpUrl),
-            PropertyItem(
-                title: translate('chain_id'),
-                value: network.chainId.toString()),
-            PropertyItem(title: translate('symbol'), value: network.symbol),
-            network.explorerUrl != null
-                ? PropertyItem(
-                    title: translate('block_explorer_url'),
-                    value: network.explorerUrl!)
-                : Container(),
-            const SizedBox(
-              height: Sizes.spaceXSmall,
-            ),
-            MxcButton.secondary(
-              key: const ValueKey('cancelButton'),
-              title: translate('cancel'),
-              onTap: () => Navigator.of(context).pop(false),
-              size: AxsButtonSize.xl,
+            Text(
+              translate(
+                'network_adding_usage_notice',
+              ),
+              style: FontTheme.of(context, listen: false).body2.primary(),
+              textAlign: TextAlign.center,
             ),
             const SizedBox(
-              height: Sizes.spaceNormal,
-            ),
-            MxcButton.primary(
-              key: const ValueKey('approveButton'),
-              title: translate('approve'),
-              onTap: () {
-                final updatedNetwork = approveFunction(network);
-                Navigator.of(context).pop(updatedNetwork != null);
-              },
-              size: AxsButtonSize.xl,
+              height: Sizes.spaceXSmall,
             ),
+            network.networkType == NetworkType.custom
+                ? Text(
+                    translate(
+                      'custom_network_security_alert',
+                    ),
+                    style: FontTheme.of(context, listen: false)
+                        .body1()
+                        .copyWith(
+                            color: ColorsTheme.of(context, listen: false)
+                                .textCritical),
+                    textAlign: TextAlign.center,
+                  )
+                : Container()
           ],
         ),
-      ),
+        const SizedBox(
+          height: Sizes.spaceXSmall,
+        ),
+        PropertyItem(
+            title: translate('network_name'),
+            value: network.label ?? network.web3RpcHttpUrl),
+        PropertyItem(
+            title: translate('rpc_url'), value: network.web3RpcHttpUrl),
+        PropertyItem(
+            title: translate('chain_id'), value: network.chainId.toString()),
+        PropertyItem(title: translate('symbol'), value: network.symbol),
+        network.explorerUrl != null
+            ? PropertyItem(
+                title: translate('block_explorer_url'),
+                value: network.explorerUrl!)
+            : Container(),
+        const SizedBox(
+          height: Sizes.spaceXSmall,
+        ),
+        MxcButton.secondary(
+          key: const ValueKey('cancelButton'),
+          title: translate('cancel'),
+          onTap: () => Navigator.of(context).pop(false),
+          size: MXCWalletButtonSize.xl,
+          edgeType: MXCWalletButtonEdgeType.hard,
+        ),
+        const SizedBox(
+          height: Sizes.spaceNormal,
+        ),
+        MxcButton.primary(
+          key: const ValueKey('approveButton'),
+          title: translate('approve'),
+          onTap: () {
+            final updatedNetwork = approveFunction(network);
+            Navigator.of(context).pop(updatedNetwork != null);
+          },
+          size: MXCWalletButtonSize.xl,
+          edgeType: MXCWalletButtonEdgeType.hard,
+        ),
+      ],
     ),
   );
 }
diff --git a/lib/common/dialogs/add_network/add_network_item.dart b/lib/common/dialogs/add_network/add_network_item.dart
index 96aab3cd..42574f31 100644
--- a/lib/common/dialogs/add_network/add_network_item.dart
+++ b/lib/common/dialogs/add_network/add_network_item.dart
@@ -1,7 +1,7 @@
-import 'package:datadashwallet/features/settings/subfeatures/chain_configuration/subfeatures/add_network/add_network_presenter.dart';
-import 'package:datadashwallet/features/settings/subfeatures/chain_configuration/subfeatures/add_network/widgets/switch_network_dialog.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/chain_configuration/subfeatures/add_network/add_network_presenter.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/chain_configuration/subfeatures/add_network/widgets/switch_network_dialog.dart';
 import 'package:mxc_logic/src/domain/entities/network.dart';
-import 'package:datadashwallet/features/settings/subfeatures/chain_configuration/widgets/chain_logo_widget.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/chain_configuration/widgets/chain_logo_widget.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
diff --git a/lib/common/dialogs/alert_dialog.dart b/lib/common/dialogs/alert_dialog.dart
index ee6a1f76..23664af0 100644
--- a/lib/common/dialogs/alert_dialog.dart
+++ b/lib/common/dialogs/alert_dialog.dart
@@ -1,3 +1,4 @@
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_ui/mxc_ui.dart';
@@ -45,17 +46,19 @@ Future<bool?> showAlertDialog({
                 MxcButton.secondary(
                   key: const ValueKey('cancelButton'),
                   title: FlutterI18n.translate(context, cancel ?? 'cancel'),
-                  size: AxsButtonSize.xl,
+                  size: MXCWalletButtonSize.xl,
                   width: 120,
                   onTap: () => Navigator.of(context).pop(false),
+                  edgeType: UIConfig.settingsScreensButtonsEdgeType,
                 ),
                 MxcButton.primaryWarning(
                   key: const ValueKey('deleteButton'),
                   title: FlutterI18n.translate(context, ok ?? 'delete'),
                   titleColor: ColorsTheme.of(context).textBlack200,
-                  size: AxsButtonSize.xl,
+                  size: MXCWalletButtonSize.xl,
                   width: 120,
                   onTap: () => Navigator.of(context).pop(true),
+                  edgeType: UIConfig.settingsScreensButtonsEdgeType,
                 ),
               ],
             ),
diff --git a/lib/common/dialogs/custom_network_swtich_dialog.dart b/lib/common/dialogs/custom_network_swtich_dialog.dart
index f7e1bace..3fb64aaa 100644
--- a/lib/common/dialogs/custom_network_swtich_dialog.dart
+++ b/lib/common/dialogs/custom_network_swtich_dialog.dart
@@ -1,3 +1,4 @@
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_ui/mxc_ui.dart';
@@ -6,63 +7,44 @@ Future<bool?> showCustomNetworkSwitchDialog(
     BuildContext context, String networkTitle) {
   String translate(String text) => FlutterI18n.translate(context, text);
 
-  return showModalBottomSheet<bool>(
+  return showBaseBottomSheet<bool>(
     context: context,
-    useRootNavigator: true,
-    isScrollControlled: true,
-    useSafeArea: true,
-    backgroundColor: Colors.transparent,
-    builder: (BuildContext context) => Container(
-      padding: const EdgeInsets.only(
-          top: Sizes.spaceNormal, bottom: Sizes.space3XLarge),
-      decoration: BoxDecoration(
-        color: ColorsTheme.of(context).layerSheetBackground,
-        borderRadius: const BorderRadius.only(
-          topLeft: Radius.circular(20),
-          topRight: Radius.circular(20),
+    content: Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Padding(
+          padding: const EdgeInsetsDirectional.only(
+              start: Sizes.spaceNormal,
+              end: Sizes.spaceNormal,
+              bottom: Sizes.space2XLarge),
+          child: Text(
+            networkTitle.contains('https')
+                ? translate('custom_network_switch_without_title__notice')
+                    .replaceFirst("{0}", networkTitle)
+                : translate('custom_network_switch_title__notice')
+                    .replaceFirst("{0}", networkTitle),
+            style: FontTheme.of(context, listen: false).h6.primary(),
+            textAlign: TextAlign.center,
+          ),
         ),
-      ),
-      child: Padding(
-        padding: const EdgeInsetsDirectional.symmetric(
-          horizontal: Sizes.spaceXLarge,
+        Text(
+          translate('custom_network_switch_text__notice'),
+          style: FontTheme.of(context, listen: false).body2.primary(),
+          textAlign: TextAlign.start,
         ),
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            Padding(
-              padding: const EdgeInsetsDirectional.only(
-                  start: Sizes.spaceNormal,
-                  end: Sizes.spaceNormal,
-                  bottom: Sizes.space2XLarge),
-              child: Text(
-                networkTitle.contains('https')
-                    ? translate('custom_network_switch_without_title__notice')
-                        .replaceFirst("{0}", networkTitle)
-                    : translate('custom_network_switch_title__notice')
-                        .replaceFirst("{0}", networkTitle),
-                style: FontTheme.of(context).h6.primary(),
-                textAlign: TextAlign.center,
-              ),
-            ),
-            Text(
-              translate('custom_network_switch_text__notice'),
-              style: FontTheme.of(context).body2.primary(),
-              textAlign: TextAlign.start,
-            ),
-            const SizedBox(
-              height: Sizes.spaceXLarge,
-            ),
-            MxcButton.primary(
-              key: const ValueKey('gotItButton'),
-              title: translate('got_it'),
-              onTap: () {
-                Navigator.of(context).pop(false);
-              },
-              size: AxsButtonSize.xl,
-            ),
-          ],
+        const SizedBox(
+          height: Sizes.spaceXLarge,
         ),
-      ),
+        MxcButton.primary(
+          key: const ValueKey('gotItButton'),
+          title: translate('got_it'),
+          onTap: () {
+            Navigator.of(context).pop(false);
+          },
+          size: MXCWalletButtonSize.xl,
+          edgeType: MXCWalletButtonEdgeType.hard,
+        ),
+      ],
     ),
   );
 }
diff --git a/lib/common/dialogs/network_details/network_details_dialog.dart b/lib/common/dialogs/network_details/network_details_dialog.dart
index b6f53482..609bcf07 100644
--- a/lib/common/dialogs/network_details/network_details_dialog.dart
+++ b/lib/common/dialogs/network_details/network_details_dialog.dart
@@ -11,106 +11,85 @@ Future<bool?> showNetworkDetailsDialog(
 }) {
   String translate(String text) => FlutterI18n.translate(context, text);
 
-  return showModalBottomSheet<bool>(
+  return showBaseBottomSheet<bool>(
     context: context,
-    useRootNavigator: true,
-    isScrollControlled: true,
-    backgroundColor: Colors.transparent,
-    useSafeArea: true,
-    builder: (BuildContext context) => Container(
-      padding: const EdgeInsets.only(
-          top: Sizes.spaceNormal, bottom: Sizes.space3XLarge),
-      decoration: BoxDecoration(
-        color: ColorsTheme.of(context).layerSheetBackground,
-        borderRadius: const BorderRadius.only(
-          topLeft: Radius.circular(20),
-          topRight: Radius.circular(20),
+    content: Column(
+      mainAxisSize: MainAxisSize.min,
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Padding(
+          padding: const EdgeInsetsDirectional.only(
+              start: Sizes.spaceNormal, end: Sizes.spaceNormal, bottom: 0),
+          child: MxcAppBarEvenly.title(
+            titleText: network.label ?? network.web3RpcHttpUrl,
+          ),
         ),
-      ),
-      child: Padding(
-        padding: const EdgeInsetsDirectional.symmetric(
-          horizontal: Sizes.spaceXLarge,
+        // Column(
+        //   crossAxisAlignment: CrossAxisAlignment.center,
+        //   children: [
+        //     Text(
+        //       translate(
+        //         'want_to_add_this_network',
+        //       ),
+        //       style: FontTheme.of(context, listen: false)
+        //           .body2
+        //           .primary()
+        //           .copyWith(fontWeight: FontWeight.w600),
+        //     ),
+        //     const SizedBox(
+        //       height: Sizes.spaceXSmall,
+        //     ),
+        //     Text(
+        //       translate(
+        //         'network_adding_usage_notice',
+        //       ),
+        //       style: FontTheme.of(context, listen: false).body2.primary(),
+        //       textAlign: TextAlign.center,
+        //     ),
+        //     const SizedBox(
+        //       height: Sizes.spaceXSmall,
+        //     ),
+        //     network.networkType == NetworkType.custom
+        //         ? Text(
+        //             translate(
+        //               'custom_network_security_alert',
+        //             ),
+        //             style: FontTheme.of(context, listen: false).body1().copyWith(
+        //                 color: ColorsTheme.of(context, listen: false).textCritical),
+        //             textAlign: TextAlign.center,
+        //           )
+        //         : Container()
+        //   ],
+        // ),
+        // const SizedBox(
+        //   height: Sizes.spaceXSmall,
+        // ),
+        PropertyItem(
+            title: translate('network_name'),
+            value: network.label ?? network.web3RpcHttpUrl),
+        PropertyItem(
+            title: translate('rpc_url'), value: network.web3RpcHttpUrl),
+        PropertyItem(
+            title: translate('chain_id'), value: network.chainId.toString()),
+        PropertyItem(title: translate('symbol'), value: network.symbol),
+        network.explorerUrl != null
+            ? PropertyItem(
+                title: translate('block_explorer_url'),
+                value: network.explorerUrl!)
+            : Container(),
+        const SizedBox(
+          height: Sizes.spaceXSmall,
         ),
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Padding(
-              padding: const EdgeInsetsDirectional.only(
-                  start: Sizes.spaceNormal, end: Sizes.spaceNormal, bottom: 0),
-              child: MxcAppBarEvenly.title(
-                titleText: network.label ?? network.web3RpcHttpUrl,
-              ),
-            ),
-            // Column(
-            //   crossAxisAlignment: CrossAxisAlignment.center,
-            //   children: [
-            //     Text(
-            //       translate(
-            //         'want_to_add_this_network',
-            //       ),
-            //       style: FontTheme.of(context)
-            //           .body2
-            //           .primary()
-            //           .copyWith(fontWeight: FontWeight.w600),
-            //     ),
-            //     const SizedBox(
-            //       height: Sizes.spaceXSmall,
-            //     ),
-            //     Text(
-            //       translate(
-            //         'network_adding_usage_notice',
-            //       ),
-            //       style: FontTheme.of(context).body2.primary(),
-            //       textAlign: TextAlign.center,
-            //     ),
-            //     const SizedBox(
-            //       height: Sizes.spaceXSmall,
-            //     ),
-            //     network.networkType == NetworkType.custom
-            //         ? Text(
-            //             translate(
-            //               'custom_network_security_alert',
-            //             ),
-            //             style: FontTheme.of(context).body1().copyWith(
-            //                 color: ColorsTheme.of(context).textCritical),
-            //             textAlign: TextAlign.center,
-            //           )
-            //         : Container()
-            //   ],
-            // ),
-            // const SizedBox(
-            //   height: Sizes.spaceXSmall,
-            // ),
-            PropertyItem(
-                title: translate('network_name'),
-                value: network.label ?? network.web3RpcHttpUrl),
-            PropertyItem(
-                title: translate('rpc_url'), value: network.web3RpcHttpUrl),
-            PropertyItem(
-                title: translate('chain_id'),
-                value: network.chainId.toString()),
-            PropertyItem(title: translate('symbol'), value: network.symbol),
-            network.explorerUrl != null
-                ? PropertyItem(
-                    title: translate('block_explorer_url'),
-                    value: network.explorerUrl!)
-                : Container(),
-            const SizedBox(
-              height: Sizes.spaceXSmall,
-            ),
-            MxcButton.secondary(
-              key: const ValueKey('closeButton'),
-              title: translate('close'),
-              onTap: () => Navigator.of(context).pop(false),
-              size: AxsButtonSize.xl,
-            ),
-            const SizedBox(
-              height: Sizes.spaceNormal,
-            ),
-          ],
+        MxcButton.secondary(
+          key: const ValueKey('closeButton'),
+          title: translate('close'),
+          onTap: () => Navigator.of(context).pop(false),
+          size: MXCWalletButtonSize.xl,
         ),
-      ),
+        const SizedBox(
+          height: Sizes.spaceNormal,
+        ),
+      ],
     ),
   );
 }
diff --git a/lib/common/dialogs/receive_bottom_sheet/components/mxc_notices.dart b/lib/common/dialogs/receive_bottom_sheet/components/mxc_notices.dart
index 4d1edd96..97555c01 100644
--- a/lib/common/dialogs/receive_bottom_sheet/components/mxc_notices.dart
+++ b/lib/common/dialogs/receive_bottom_sheet/components/mxc_notices.dart
@@ -19,7 +19,16 @@ List<TextSpan> depositFromExchangesNotice(
   final fourthSplit = thirdSplit[1].split('{3}');
   final fourthPart = fourthSplit[0];
 
-  final fifthPart = fourthSplit[1];
+  final fifthSplit = fourthSplit[1].split('{4}');
+  final fifthPart = fifthSplit[0];
+
+  final sixthSplit = fifthSplit[1].split('{5}');
+  final sixthPart = sixthSplit[0];
+
+  final seventhSplit = sixthSplit[1].split('{6}');
+  final seventhPart = seventhSplit[0];
+
+  final eighthPart = seventhSplit[1];
   return [
     TextSpan(
       text: firstPart,
@@ -72,6 +81,42 @@ List<TextSpan> depositFromExchangesNotice(
         },
     ),
     TextSpan(text: fifthPart),
+    TextSpan(
+      text: 'Bitget',
+      style: TextStyle(
+        color: ColorsTheme.of(context, listen: false).textSecondary,
+        decoration: TextDecoration.underline,
+      ),
+      recognizer: TapGestureRecognizer()
+        ..onTap = () {
+          launchUrl(Urls.bitget);
+        },
+    ),
+    TextSpan(text: sixthPart),
+    TextSpan(
+      text: 'HTX',
+      style: TextStyle(
+        color: ColorsTheme.of(context, listen: false).textSecondary,
+        decoration: TextDecoration.underline,
+      ),
+      recognizer: TapGestureRecognizer()
+        ..onTap = () {
+          launchUrl(Urls.htx);
+        },
+    ),
+    TextSpan(text: seventhPart),
+    TextSpan(
+      text: 'BitMart',
+      style: TextStyle(
+        color: ColorsTheme.of(context, listen: false).textSecondary,
+        decoration: TextDecoration.underline,
+      ),
+      recognizer: TapGestureRecognizer()
+        ..onTap = () {
+          launchUrl(Urls.bitmart);
+        },
+    ),
+    TextSpan(text: eighthPart),
   ];
 }
 
diff --git a/lib/common/dialogs/receive_bottom_sheet/components/receive_bottom_sheet.dart b/lib/common/dialogs/receive_bottom_sheet/components/receive_bottom_sheet.dart
index 94343814..78084f79 100644
--- a/lib/common/dialogs/receive_bottom_sheet/components/receive_bottom_sheet.dart
+++ b/lib/common/dialogs/receive_bottom_sheet/components/receive_bottom_sheet.dart
@@ -1,7 +1,7 @@
 import 'dart:ui';
 
 import 'package:clipboard/clipboard.dart';
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_logic/mxc_logic.dart';
@@ -26,94 +26,88 @@ class ReceiveBottomSheet extends StatelessWidget {
         MXCFormatter.formatWalletAddress(walletAddress ?? '');
     bool isWalletAddressCopied = false;
 
-    return BackdropFilter(
-      filter: ImageFilter.blur(
-        sigmaX: 20,
-        sigmaY: 20,
-      ),
-      child: Container(
-        padding: const EdgeInsets.only(right: 24, left: 24, bottom: 44),
-        decoration: BoxDecoration(
-          color: ColorsTheme.of(context).cardBackground,
-          borderRadius: const BorderRadius.only(
-            topLeft: Radius.circular(20),
-            topRight: Radius.circular(20),
-          ),
+    return Container(
+      padding: const EdgeInsets.only(right: 24, left: 24, bottom: 44),
+      decoration: BoxDecoration(
+        color: ColorsTheme.of(context).layerSheetBackground,
+        borderRadius: const BorderRadius.only(
+          topLeft: Radius.circular(20),
+          topRight: Radius.circular(20),
         ),
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            MxcAppBarEvenly.title(
-              titleText: FlutterI18n.translate(context, 'receive'),
-              action: Container(
-                alignment: Alignment.centerRight,
-                child: InkWell(
-                  child: const Icon(Icons.close),
-                  onTap: () => Navigator.of(context).pop(false),
-                ),
-              ),
-            ),
-            if (showError)
-              Text(
-                FlutterI18n.translate(context, 'insufficient_funds_notice'),
-                style: FontTheme.of(context).body1.error(),
-                textAlign: TextAlign.center,
+      ),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          MxcAppBarEvenly.title(
+            titleText: FlutterI18n.translate(context, 'receive'),
+            action: Container(
+              alignment: Alignment.centerRight,
+              child: InkWell(
+                child: const Icon(Icons.close),
+                onTap: () => Navigator.of(context).pop(false),
               ),
-            QrImageView(
-              data: walletAddress ?? '',
-              size: 215,
-              dataModuleStyle: QrDataModuleStyle(
-                  color: ColorsTheme.of(context).textPrimary,
-                  dataModuleShape: QrDataModuleShape.square),
-              eyeStyle: QrEyeStyle(
-                  color: ColorsTheme.of(context).textPrimary,
-                  eyeShape: QrEyeShape.square),
             ),
-            const SizedBox(height: 16),
+          ),
+          if (showError)
             Text(
-              FlutterI18n.translate(context,
-                  'scan_or_copy_address_below_to_receive_tokens_or_nfts'),
-              style: FontTheme.of(context).body1.secondary(),
+              FlutterI18n.translate(context, 'insufficient_funds_notice'),
+              style: FontTheme.of(context).body1.error(),
               textAlign: TextAlign.center,
             ),
-            BlackBox(
-              child: StatefulBuilder(builder: (_, setState) {
-                return Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    children: [
-                      Text(
-                        formattedWalletAddress,
-                        style: FontTheme.of(context).subtitle1.primary(),
-                      ),
-                      MxcChipButton(
-                        key: const Key('copyButton'),
-                        onTap: () async {
-                          await FlutterClipboard.copy(walletAddress ?? '');
-                          setState(() => isWalletAddressCopied = true);
-                        },
-                        title: isWalletAddressCopied
-                            ? FlutterI18n.translate(context, 'copied')
-                            : FlutterI18n.translate(context, 'copy_address'),
-                        iconData: Icons.check_circle_rounded,
-                        iconSize: 16,
-                        alignIconStart: true,
-                        iconColor: isWalletAddressCopied
-                            ? ColorsTheme.of(context).iconBlack200
-                            : ColorsTheme.of(context).iconPrimary,
-                        textStyle: isWalletAddressCopied
-                            ? FontTheme.of(context).subtitle1().copyWith(
-                                color: ColorsTheme.of(context).textBlack200)
-                            : FontTheme.of(context).subtitle1.primary(),
-                        backgroundColor: isWalletAddressCopied
-                            ? ColorsTheme.of(context).systemStatusActive
-                            : null,
-                      )
-                    ]);
-              }),
-            ),
-            ...noticeComponents
-          ],
-        ),
+          QrImageView(
+            data: walletAddress ?? '',
+            size: 215,
+            dataModuleStyle: QrDataModuleStyle(
+                color: ColorsTheme.of(context).textPrimary,
+                dataModuleShape: QrDataModuleShape.square),
+            eyeStyle: QrEyeStyle(
+                color: ColorsTheme.of(context).textPrimary,
+                eyeShape: QrEyeShape.square),
+          ),
+          const SizedBox(height: 16),
+          Text(
+            FlutterI18n.translate(context,
+                'scan_or_copy_address_below_to_receive_tokens_or_nfts'),
+            style: FontTheme.of(context).body1.secondary(),
+            textAlign: TextAlign.center,
+          ),
+          BlackBox(
+            child: StatefulBuilder(builder: (_, setState) {
+              return Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  children: [
+                    Text(
+                      formattedWalletAddress,
+                      style: FontTheme.of(context).subtitle1.primary(),
+                    ),
+                    MxcChipButton(
+                      key: const Key('copyButton'),
+                      onTap: () async {
+                        await FlutterClipboard.copy(walletAddress ?? '');
+                        setState(() => isWalletAddressCopied = true);
+                      },
+                      title: isWalletAddressCopied
+                          ? FlutterI18n.translate(context, 'copied')
+                          : FlutterI18n.translate(context, 'copy_address'),
+                      iconData: Icons.check_circle_rounded,
+                      iconSize: 16,
+                      alignIconStart: true,
+                      iconColor: isWalletAddressCopied
+                          ? ColorsTheme.of(context).iconBlack200
+                          : ColorsTheme.of(context).iconPrimary,
+                      textStyle: isWalletAddressCopied
+                          ? FontTheme.of(context).subtitle1().copyWith(
+                              color: ColorsTheme.of(context).textBlack200)
+                          : FontTheme.of(context).subtitle1.primary(),
+                      backgroundColor: isWalletAddressCopied
+                          ? ColorsTheme.of(context).systemStatusActive
+                          : null,
+                    )
+                  ]);
+            }),
+          ),
+          ...noticeComponents
+        ],
       ),
     );
   }
diff --git a/lib/common/dialogs/receive_bottom_sheet/receive_bottom_sheet_utils.dart b/lib/common/dialogs/receive_bottom_sheet/receive_bottom_sheet_utils.dart
index 16e63432..2beb321a 100644
--- a/lib/common/dialogs/receive_bottom_sheet/receive_bottom_sheet_utils.dart
+++ b/lib/common/dialogs/receive_bottom_sheet/receive_bottom_sheet_utils.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_ui/mxc_ui.dart';
diff --git a/lib/common/dialogs/warning_dialog.dart b/lib/common/dialogs/warning_dialog.dart
index bd6d583a..33183b9d 100644
--- a/lib/common/dialogs/warning_dialog.dart
+++ b/lib/common/dialogs/warning_dialog.dart
@@ -1,3 +1,4 @@
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_ui/mxc_ui.dart';
@@ -52,15 +53,17 @@ Future<bool?> showWarningDialog({
               key: const ValueKey('deleteButton'),
               title: FlutterI18n.translate(context, ok ?? 'delete'),
               titleColor: ColorsTheme.of(context).textBlack200,
-              size: AxsButtonSize.xl,
+              size: MXCWalletButtonSize.xl,
               onTap: () => Navigator.of(context).pop(true),
+              edgeType: UIConfig.settingsScreensButtonsEdgeType,
             ),
             const SizedBox(height: Sizes.spaceNormal),
             MxcButton.secondary(
               key: const ValueKey('cancelButton'),
               title: FlutterI18n.translate(context, cancel ?? 'cancel'),
-              size: AxsButtonSize.xl,
+              size: MXCWalletButtonSize.xl,
               onTap: () => Navigator.of(context).pop(false),
+              edgeType: UIConfig.settingsScreensButtonsEdgeType,
             ),
           ],
         ),
diff --git a/lib/common/hooks/context_hook.dart b/lib/common/hooks/context_hook.dart
index 4c8fb9a1..9e9fbe06 100644
--- a/lib/common/hooks/context_hook.dart
+++ b/lib/common/hooks/context_hook.dart
@@ -1,6 +1,6 @@
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:flutter/material.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 
 class MxcContextHook extends StatefulWidget {
   const MxcContextHook({
diff --git a/lib/common/hooks/error_hook.dart b/lib/common/hooks/error_hook.dart
index 9cb9133c..162574a5 100644
--- a/lib/common/hooks/error_hook.dart
+++ b/lib/common/hooks/error_hook.dart
@@ -1,10 +1,10 @@
 import 'dart:async';
 
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 import 'package:provider/provider.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 
 class MxcErrorHook extends StatefulWidget {
   const MxcErrorHook({
diff --git a/lib/common/hooks/success_hook.dart b/lib/common/hooks/success_hook.dart
index 1d0df20c..e4992f79 100644
--- a/lib/common/hooks/success_hook.dart
+++ b/lib/common/hooks/success_hook.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 
diff --git a/lib/common/layout/mxc_layout.dart b/lib/common/layout/mxc_layout.dart
index 597a1fb9..4ad620d3 100644
--- a/lib/common/layout/mxc_layout.dart
+++ b/lib/common/layout/mxc_layout.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
 
 typedef ChildrenBuilder = List<Widget> Function(
     BuildContext context, BoxConstraints constraints);
diff --git a/lib/common/layout/mxc_page.dart b/lib/common/layout/mxc_page.dart
index f10270a4..cbcdc746 100644
--- a/lib/common/layout/mxc_page.dart
+++ b/lib/common/layout/mxc_page.dart
@@ -4,8 +4,8 @@ import 'package:flutter/services.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 import 'package:sliver_tools/sliver_tools.dart';
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
 
 import 'mxc_page_regular.dart';
 import 'mxc_page_layer.dart';
@@ -35,6 +35,7 @@ abstract class MxcPage extends HookConsumerWidget {
     this.useFooterPadding = true,
     this.resizeToAvoidBottomInset = true,
     this.useSplashBackground = false,
+    this.useGradientBackground = false,
   })  : assert(scrollController == null || layout != LayoutType.column),
         super(key: key);
 
@@ -60,6 +61,7 @@ abstract class MxcPage extends HookConsumerWidget {
     bool useFooterPadding,
     bool resizeToAvoidBottomInset,
     bool useSplashBackground,
+    bool useGradientBackground,
     bool useAppBar,
   }) = MxcPageRegular;
 
@@ -84,6 +86,8 @@ abstract class MxcPage extends HookConsumerWidget {
     bool useFooterPadding,
     bool resizeToAvoidBottomInset,
     bool useSplashBackground,
+    bool useGradientBackground,
+    Color? upperBackgroundColor,
   }) = MxcPageLayer;
 
   final Key? scaffoldKey;
@@ -109,6 +113,7 @@ abstract class MxcPage extends HookConsumerWidget {
   final bool resizeToAvoidBottomInset;
 
   final bool useSplashBackground;
+  final bool useGradientBackground;
 
   Widget buildChildrenAsSliver(BoxConstraints? constraints) {
     Widget sliver;
@@ -178,20 +183,22 @@ abstract class MxcPage extends HookConsumerWidget {
     if (backgroundColor != null) {
       return backgroundColor!;
     }
-    return ColorsTheme.of(context).screenBackground;
+    return ColorsTheme.of(context).darkGray;
   }
 
-  Widget splashLinearBackground({
+  Widget paintBackground({
     Widget? child,
-    bool visiable = true,
+    bool splashBackgroundVisible = true,
+    bool gradientBackgroundVisible = false,
+    required BuildContext context,
   }) {
-    if (visiable) {
+    if (splashBackgroundVisible) {
       return Container(
         decoration: const BoxDecoration(
           gradient: SweepGradient(
             colors: <Color>[
-              Color(0xFF0F46F4),
-              Color(0xFF082FAF),
+              Color(0xFF1B1B1B),
+              Color(0xFF010101),
             ],
             tileMode: TileMode.clamp,
             transform: GradientRotation(2.5),
@@ -199,6 +206,14 @@ abstract class MxcPage extends HookConsumerWidget {
         ),
         child: child,
       );
+    }
+    if (gradientBackgroundVisible) {
+      return Container(
+        decoration: BoxDecoration(
+          gradient: UIConfig.gradientBackground(context),
+        ),
+        child: child,
+      );
     } else {
       return Container(child: child);
     }
@@ -243,8 +258,10 @@ abstract class MxcPage extends HookConsumerWidget {
                 FloatingActionButtonLocation.miniCenterFloat,
             body: PresenterHooks(
               presenter: presenter,
-              child: splashLinearBackground(
-                visiable: useSplashBackground,
+              child: paintBackground(
+                context: context,
+                splashBackgroundVisible: useSplashBackground,
+                gradientBackgroundVisible: useGradientBackground,
                 child: SafeArea(
                   bottom: maintainBottomSafeArea,
                   top: topSafeArea,
diff --git a/lib/common/layout/mxc_page_layer.dart b/lib/common/layout/mxc_page_layer.dart
index d9a02288..7a02e817 100644
--- a/lib/common/layout/mxc_page_layer.dart
+++ b/lib/common/layout/mxc_page_layer.dart
@@ -7,7 +7,7 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 import 'package:sliver_tools/sliver_tools.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 
 import 'layout.dart';
 
@@ -30,10 +30,12 @@ class MxcPageLayer extends MxcPage {
     bool fixedFooter = false,
     Widget? floatingActionButton,
     Color? backgroundColor,
+    this.upperBackgroundColor,
     Gradient? backgroundGradient,
     bool useFooterPadding = true,
     bool resizeToAvoidBottomInset = true,
     bool useSplashBackground = false,
+    bool useGradientBackground = false,
   })  : assert(layout != LayoutType.column2 || footer == null || fixedFooter,
             'layout: column2 and fixedFooter: false isn\'t compatible, pls set fixedFooter: true'),
         super.internal(
@@ -58,6 +60,7 @@ class MxcPageLayer extends MxcPage {
           useFooterPadding: useFooterPadding,
           resizeToAvoidBottomInset: resizeToAvoidBottomInset,
           useSplashBackground: useSplashBackground,
+          useGradientBackground: useGradientBackground,
         );
 
   @override
@@ -66,15 +69,17 @@ class MxcPageLayer extends MxcPage {
   @override
   bool get maintainBottomSafeArea => false;
 
+  final Color? upperBackgroundColor;
+
   @override
   Color resolveBackgroundColor(BuildContext context) {
-    if (backgroundColor != null) {
-      return backgroundColor!;
+    if (upperBackgroundColor != null) {
+      return upperBackgroundColor!;
     }
     if (BottomFlowDialog.maybeOf(context) != null) {
-      return ColorsTheme.of(context).primaryBackground;
+      return ColorsTheme.of(context).darkBlue;
     }
-    return ColorsTheme.of(context).primaryBackground;
+    return ColorsTheme.of(context).darkBlue;
   }
 
   @override
@@ -149,7 +154,8 @@ class MxcPageLayer extends MxcPage {
                   ColorsTheme.of(context).layerSheetBackground,
             )
           : Container(
-              color: ColorsTheme.of(context).layerSheetBackground,
+              color: backgroundColor ??
+                  ColorsTheme.of(context).layerSheetBackground,
               alignment: Alignment.bottomCenter,
               child: Padding(
                 padding: (useFooterPadding
@@ -218,7 +224,8 @@ class MxcPageLayer extends MxcPage {
                       ),
                     ),
                     child: ColoredBox(
-                      color: ColorsTheme.of(context).layerSheetBackground,
+                      color: backgroundColor ??
+                          ColorsTheme.of(context).layerSheetBackground,
                     ),
                   ),
                 ),
@@ -296,7 +303,8 @@ class MxcPageLayer extends MxcPage {
                 topLeft: Radius.circular(bottomFlowDialogRoundedCornersRadius),
                 topRight: Radius.circular(bottomFlowDialogRoundedCornersRadius),
               ),
-              color: ColorsTheme.of(context).layerSheetBackground,
+              color: backgroundColor ??
+                  ColorsTheme.of(context).layerSheetBackground,
             ),
             child: Column(
               crossAxisAlignment: crossAxisAlignment,
diff --git a/lib/common/layout/mxc_page_regular.dart b/lib/common/layout/mxc_page_regular.dart
index 89b361b1..86fa661a 100644
--- a/lib/common/layout/mxc_page_regular.dart
+++ b/lib/common/layout/mxc_page_regular.dart
@@ -3,7 +3,7 @@ import 'package:flutter/material.dart' hide RefreshCallback;
 import 'package:flutter/services.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:mxc_ui/mxc_ui.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 
 import 'layout.dart';
 
@@ -30,6 +30,7 @@ class MxcPageRegular extends MxcPage {
     bool useFooterPadding = true,
     bool resizeToAvoidBottomInset = true,
     bool useSplashBackground = false,
+    bool useGradientBackground = false,
     bool useAppBar = false,
   }) : super.internal(
           key: key,
@@ -53,6 +54,7 @@ class MxcPageRegular extends MxcPage {
           useFooterPadding: useFooterPadding,
           resizeToAvoidBottomInset: resizeToAvoidBottomInset,
           useSplashBackground: useSplashBackground,
+          useGradientBackground: useGradientBackground,
         );
 
   @override
diff --git a/lib/common/ui_config.dart b/lib/common/ui_config.dart
new file mode 100644
index 00000000..1266d2a2
--- /dev/null
+++ b/lib/common/ui_config.dart
@@ -0,0 +1,23 @@
+import 'package:flutter/material.dart';
+import 'package:mxc_ui/mxc_ui.dart';
+
+class UIConfig {
+  static MXCWalletButtonEdgeType get splashScreensButtonsEdgeType =>
+      MXCWalletButtonEdgeType.hard;
+  static MXCWalletButtonEdgeType get securityScreensButtonsEdgeType =>
+      MXCWalletButtonEdgeType.hard;
+  static MXCWalletButtonEdgeType get settingsScreensButtonsEdgeType =>
+      MXCWalletButtonEdgeType.hard;
+  static LinearGradient gradientBackground(BuildContext context) =>
+      LinearGradient(
+        colors: [
+          ColorsTheme.of(context).darkBlue,
+          ColorsTheme.of(context).charcoalGray,
+        ],
+        begin: Alignment.topLeft,
+        end: Alignment.bottomRight,
+      );
+
+  static Radius defaultRadius = const Radius.circular(10);
+  static BorderRadiusGeometry defaultBorderRadiusAll = BorderRadius.all(defaultRadius);
+}
diff --git a/lib/common/utils/permission.dart b/lib/common/utils/permission.dart
index bac758a8..3811382e 100644
--- a/lib/common/utils/permission.dart
+++ b/lib/common/utils/permission.dart
@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:datadashwallet/common/utils/permissions_bottom_sheet.dart';
+import 'package:moonchain_wallet/common/utils/permissions_bottom_sheet.dart';
 import 'package:f_logs/f_logs.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/widgets.dart';
diff --git a/lib/common/utils/permissions_bottom_sheet.dart b/lib/common/utils/permissions_bottom_sheet.dart
index 9ade56a5..4ff56b8f 100644
--- a/lib/common/utils/permissions_bottom_sheet.dart
+++ b/lib/common/utils/permissions_bottom_sheet.dart
@@ -1,3 +1,4 @@
+import 'package:moonchain_wallet/common/bottom_sheets/bottom_sheets.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
@@ -9,64 +10,44 @@ Future<bool?> showPermissionUseCasesBottomSheet(
 }) {
   String translate(String text) => FlutterI18n.translate(context, text);
 
-  return showModalBottomSheet<bool>(
+  return showBaseBottomSheet<bool>(
     context: context,
-    useRootNavigator: true,
-    isScrollControlled: true,
-    useSafeArea: true,
-    backgroundColor: Colors.transparent,
-    builder: (BuildContext context) => Container(
-      padding: const EdgeInsets.only(
-          top: Sizes.spaceNormal, bottom: Sizes.space3XLarge),
-      decoration: BoxDecoration(
-        color: ColorsTheme.of(context).layerSheetBackground,
-        borderRadius: const BorderRadius.only(
-          topLeft: Radius.circular(20),
-          topRight: Radius.circular(20),
+    content: Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Padding(
+          padding: const EdgeInsetsDirectional.only(
+              start: Sizes.spaceNormal,
+              end: Sizes.spaceNormal,
+              bottom: Sizes.space2XLarge),
+          child: MxcAppBarEvenly.title(
+            titleText: translate('permission_use_cases'),
+          ),
         ),
-      ),
-      child: Padding(
-        padding: const EdgeInsetsDirectional.symmetric(
-          horizontal: Sizes.spaceXLarge,
+        Text(
+          translate(getPermissionUseCaseText(permission)),
+          style: FontTheme.of(context, listen: false).body2.primary(),
+          textAlign: TextAlign.center,
         ),
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            Padding(
-              padding: const EdgeInsetsDirectional.only(
-                  start: Sizes.spaceNormal,
-                  end: Sizes.spaceNormal,
-                  bottom: Sizes.space2XLarge),
-              child: MxcAppBarEvenly.title(
-                titleText: translate('permission_use_cases'),
-              ),
-            ),
-            Text(
-              translate(getPermissionUseCaseText(permission)),
-              style: FontTheme.of(context).body2.primary(),
-              textAlign: TextAlign.center,
-            ),
-            const SizedBox(
-              height: Sizes.spaceXLarge,
-            ),
-            MxcButton.secondary(
-              key: const ValueKey('notNow'),
-              title: translate('not_now'),
-              onTap: () => Navigator.of(context).pop(false),
-              size: AxsButtonSize.xl,
-            ),
-            const SizedBox(
-              height: Sizes.spaceXLarge,
-            ),
-            MxcButton.primary(
-              key: const ValueKey('okAllow'),
-              title: translate('ok_allow'),
-              onTap: () => Navigator.of(context).pop(true),
-              size: AxsButtonSize.xl,
-            ),
-          ],
+        const SizedBox(
+          height: Sizes.spaceXLarge,
         ),
-      ),
+        MxcButton.secondary(
+          key: const ValueKey('notNow'),
+          title: translate('not_now'),
+          onTap: () => Navigator.of(context).pop(false),
+          size: MXCWalletButtonSize.xl,
+        ),
+        const SizedBox(
+          height: Sizes.spaceXLarge,
+        ),
+        MxcButton.primary(
+          key: const ValueKey('okAllow'),
+          title: translate('ok_allow'),
+          onTap: () => Navigator.of(context).pop(true),
+          size: MXCWalletButtonSize.xl,
+        ),
+      ],
     ),
   );
 }
@@ -75,14 +56,14 @@ String getPermissionUseCaseText(Permission permission) {
   if (Permission.location == permission ||
       Permission.locationAlways == permission ||
       Permission.locationWhenInUse == permission) {
-    return 'axs_location_permission_use_case';
+    return 'moonchain_location_permission_use_case';
   } else if (Permission.camera == permission) {
-    return 'axs_camera_permission_use_case';
+    return 'moonchain_camera_permission_use_case';
   } else if (Permission.storage == permission) {
-    return 'axs_storage_permission_use_case';
+    return 'moonchain_storage_permission_use_case';
   } else if (Permission.photos == permission) {
-    return 'axs_photos_permission_use_case';
+    return 'moonchain_photos_permission_use_case';
   } else {
-    return 'axs_location_permission_use_case';
+    return 'moonchain_location_permission_use_case';
   }
 }
diff --git a/lib/common/utils/validation.dart b/lib/common/utils/validation.dart
index 1e38b7a1..296e1537 100644
--- a/lib/common/utils/validation.dart
+++ b/lib/common/utils/validation.dart
@@ -1,5 +1,5 @@
 import 'package:mxc_logic/mxc_logic.dart';
-import 'package:datadashwallet/common/utils/utils.dart';
+import 'package:moonchain_wallet/common/utils/utils.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:web3dart/web3dart.dart';
@@ -146,4 +146,14 @@ class Validation {
       return false;
     }
   }
+
+  static String? checkEmailAddress(BuildContext context, String value) {
+    String pattern =
+        r'^[a-zA-Z0-9.a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9]+\.[a-zA-Z]+';
+    RegExp regex = RegExp(pattern);
+    if (!regex.hasMatch(value)) {
+      return FlutterI18n.translate(context, 'invalid_email');
+    }
+    return null;
+  }
 }
diff --git a/lib/core/core.dart b/lib/core/core.dart
index e215ebbf..1b5eb854 100644
--- a/lib/core/core.dart
+++ b/lib/core/core.dart
@@ -13,6 +13,6 @@ export 'src/wrap.dart';
 export 'src/pagination_list.dart';
 export 'src/disposable.dart';
 export 'src/cache/base_cache.dart';
-export 'src/notification.dart';
-export 'src/firebase/firebase.dart';
+export 'src/moonchain_wallet_notification.dart';
+export 'src/firebase/moonchain_wallet_firebase.dart';
 export 'src/background_process/background_process.dart';
diff --git a/lib/core/src/background_process/background_process.dart b/lib/core/src/background_process/background_process.dart
index 3f60f9af..4f1feb26 100644
--- a/lib/core/src/background_process/background_process.dart
+++ b/lib/core/src/background_process/background_process.dart
@@ -1,4 +1,4 @@
 export 'dapp_hooks_service.dart';
 export 'notifications_service.dart';
-export 'axs_background_fetch.dart';
+export 'mxc_wallet_background_fetch.dart';
 
diff --git a/lib/core/src/background_process/dapp_hooks_service.dart b/lib/core/src/background_process/dapp_hooks_service.dart
index c2670c05..db871e93 100644
--- a/lib/core/src/background_process/dapp_hooks_service.dart
+++ b/lib/core/src/background_process/dapp_hooks_service.dart
@@ -1,5 +1,5 @@
 import 'package:background_fetch/background_fetch.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:mxc_logic/mxc_logic.dart';
@@ -30,7 +30,7 @@ class DAppHooksService {
 
       // Make sure user is logged in
       if (isLoggedIn && MXCChains.isMXCChains(chainId) && wifiHooksEnabled) {
-        await AXSNotification()
+        await MoonchainWalletNotification()
             .setupFlutterNotifications(shouldInitFirebase: false);
 
         await dAppHooksUseCase.sendWifiInfo(
@@ -74,7 +74,7 @@ class DAppHooksService {
       final selectedMiners = dappHooksData.minerHooks.selectedMiners;
       // Make sure user is logged in
       if (isLoggedIn && MXCChains.isMXCChains(chainId) && minerHooksEnabled) {
-        await AXSNotification()
+        await MoonchainWalletNotification()
             .setupFlutterNotifications(shouldInitFirebase: false);
 
         await dAppHooksUseCase.executeMinerAutoClaim(
@@ -118,7 +118,7 @@ class DAppHooksService {
       final selectedRings = dappHooksData.blueberryRingHooks.selectedRings;
       // Make sure user is logged in
       if (isLoggedIn && MXCChains.isMXCChains(chainId) && autoSyncEnabled) {
-        await AXSNotification()
+        await MoonchainWalletNotification()
             .setupFlutterNotifications(shouldInitFirebase: false);
 
         await dAppHooksUseCase.syncBlueberryRingSync(
diff --git a/lib/core/src/background_process/axs_background_fetch.dart b/lib/core/src/background_process/mxc_wallet_background_fetch.dart
similarity index 84%
rename from lib/core/src/background_process/axs_background_fetch.dart
rename to lib/core/src/background_process/mxc_wallet_background_fetch.dart
index e4dc9428..8e322169 100644
--- a/lib/core/src/background_process/axs_background_fetch.dart
+++ b/lib/core/src/background_process/mxc_wallet_background_fetch.dart
@@ -1,10 +1,10 @@
 import 'dart:io';
 
 import 'package:background_fetch/background_fetch.dart' as bgFetch;
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
-class AXSBackgroundFetch {
+class MXCWalletBackgroundFetch {
   @pragma(
       'vm:entry-point') // Mandatory if the App is obfuscated or using Flutter 3.1+
   static void handleHeadlessCallBackDispatcher(
@@ -29,7 +29,8 @@ class AXSBackgroundFetch {
     } else if (taskId == BackgroundExecutionConfig.minerAutoClaimTask) {
       DAppHooksService.autoClaimServiceCallBackDispatcherForeground(taskId);
     } else if (taskId == BackgroundExecutionConfig.blueberryAutoSyncTask) {
-      DAppHooksService.blueberryAutoSyncServiceCallBackDispatcherForeground(taskId);
+      DAppHooksService.blueberryAutoSyncServiceCallBackDispatcherForeground(
+          taskId);
     } else {
       bgFetch.BackgroundFetch.finish(taskId);
     }
@@ -69,17 +70,18 @@ class AXSBackgroundFetch {
   static Future<bool> _configureBackgroundProcess() async {
     final configurationState = await bgFetch.BackgroundFetch.configure(
         bgFetch.BackgroundFetchConfig(
-            minimumFetchInterval:
-                BackgroundExecutionConfig.axsBackgroundServiceInterval,
-            forceAlarmManager: true,
-            stopOnTerminate: false,
-            enableHeadless: true,
-            startOnBoot: true,
-            requiresBatteryNotLow: false,
-            requiresCharging: false,
-            requiresStorageNotLow: false,
-            requiresDeviceIdle: false,
-            requiredNetworkType: bgFetch.NetworkType.ANY,),
+          minimumFetchInterval:
+              BackgroundExecutionConfig.mxcWalletBackgroundServiceInterval,
+          forceAlarmManager: true,
+          stopOnTerminate: false,
+          enableHeadless: true,
+          startOnBoot: true,
+          requiresBatteryNotLow: false,
+          requiresCharging: false,
+          requiresStorageNotLow: false,
+          requiresDeviceIdle: false,
+          requiredNetworkType: bgFetch.NetworkType.ANY,
+        ),
         handleCallBackDispatcher);
     // Android Only
     final backgroundFetchState =
diff --git a/lib/core/src/background_process/notifications_service.dart b/lib/core/src/background_process/notifications_service.dart
index cf4eabb9..518f0cac 100644
--- a/lib/core/src/background_process/notifications_service.dart
+++ b/lib/core/src/background_process/notifications_service.dart
@@ -1,5 +1,5 @@
 import 'package:background_fetch/background_fetch.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
@@ -49,7 +49,7 @@ class NotificationsService {
 
       // Make sure user is logged in
       if (isLoggedIn && MXCChains.isMXCChains(chainId) && serviceEnabled) {
-        await AXSNotification()
+        await MoonchainWalletNotification()
             .setupFlutterNotifications(shouldInitFirebase: false);
 
         if (lowBalanceLimitEnabled) {
diff --git a/lib/core/src/cache/datadash_cache.dart b/lib/core/src/cache/datadash_cache.dart
index f7b7b730..5cd32bd8 100644
--- a/lib/core/src/cache/datadash_cache.dart
+++ b/lib/core/src/cache/datadash_cache.dart
@@ -1,11 +1,11 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/features/dapps/domain/domain.dart';
-import 'package:datadashwallet/features/portfolio/subfeatures/nft/domain/nfts_repository.dart';
-import 'package:datadashwallet/features/settings/subfeatures/address_book/domain/recipients_repository.dart';
-import 'package:datadashwallet/features/portfolio/subfeatures/token/add_token/domain/custom_tokens_repository.dart';
-import 'package:datadashwallet/features/dapps/subfeatures/add_dapp/domain/bookmark_repository.dart';
-import 'package:datadashwallet/features/settings/subfeatures/dapp_hooks/domain/dapp_hooks_repository.dart';
-import 'package:datadashwallet/features/settings/subfeatures/notifications/domain/background_fetch_config_repository.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/features/dapps/domain/domain.dart';
+import 'package:moonchain_wallet/features/portfolio/subfeatures/nft/domain/nfts_repository.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/address_book/domain/recipients_repository.dart';
+import 'package:moonchain_wallet/features/portfolio/subfeatures/token/add_token/domain/custom_tokens_repository.dart';
+import 'package:moonchain_wallet/features/dapps/subfeatures/add_dapp/domain/bookmark_repository.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/dapp_hooks/domain/dapp_hooks_repository.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/notifications/domain/background_fetch_config_repository.dart';
 import 'package:mxc_logic/internal.dart';
 
 import 'base_cache.dart';
diff --git a/lib/core/src/cache/global_cache.dart b/lib/core/src/cache/global_cache.dart
index 0b67adec..c9d19d3e 100644
--- a/lib/core/src/cache/global_cache.dart
+++ b/lib/core/src/cache/global_cache.dart
@@ -1,9 +1,9 @@
-import 'package:datadashwallet/features/common/account/account_cache_repository.dart';
-import 'package:datadashwallet/features/dapps/domain/domain.dart';
-import 'package:datadashwallet/features/security/security.dart';
+import 'package:moonchain_wallet/features/common/account/account_cache_repository.dart';
+import 'package:moonchain_wallet/features/dapps/domain/domain.dart';
+import 'package:moonchain_wallet/features/security/security.dart';
 import 'package:mxc_logic/internal.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/settings.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/settings.dart';
 
 /// This is cache related to our entire app
 /// It is implied that it should never be changed from outside as a result of any events.
diff --git a/lib/core/src/firebase/firebase.dart b/lib/core/src/firebase/moonchain_wallet_firebase.dart
similarity index 87%
rename from lib/core/src/firebase/firebase.dart
rename to lib/core/src/firebase/moonchain_wallet_firebase.dart
index b6d6ade4..4e979207 100644
--- a/lib/core/src/firebase/firebase.dart
+++ b/lib/core/src/firebase/moonchain_wallet_firebase.dart
@@ -1,15 +1,16 @@
 import 'dart:io';
 
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/src/notification.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/src/moonchain_wallet_notification.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 
 import 'firebase_options.dart';
 export 'firebase_options.dart';
 
-class AXSFireBase {
-  static AXSNotification get axsNotification => AXSNotification();
+class MoonchainWalletFireBase {
+  static MoonchainWalletNotification get moonchainNotification =>
+      MoonchainWalletNotification();
 
   static String? firebaseToken;
   static int buildTap = 0;
@@ -24,7 +25,8 @@ class AXSFireBase {
     firebaseToken = Platform.isAndroid
         ? await FirebaseMessaging.instance.getToken()
         : await FirebaseMessaging.instance.getAPNSToken();
-    FirebaseMessaging.onMessage.listen(axsNotification.showFlutterNotification);
+    FirebaseMessaging.onMessage
+        .listen(moonchainNotification.showFlutterNotification);
   }
 
   // It is assumed that all messages contain a data field with the key 'type'
@@ -77,7 +79,7 @@ class AXSFireBase {
   static Future<bool> _initLocalNotifications() async {
     final isGranted = await PermissionUtils.initNotificationPermission();
     if (isGranted) {
-      axsNotification.setupFlutterNotifications();
+      moonchainNotification.setupFlutterNotifications();
     }
     return isGranted;
   }
diff --git a/lib/core/src/notification.dart b/lib/core/src/moonchain_wallet_notification.dart
similarity index 78%
rename from lib/core/src/notification.dart
rename to lib/core/src/moonchain_wallet_notification.dart
index 21b95b3a..528f4522 100644
--- a/lib/core/src/notification.dart
+++ b/lib/core/src/moonchain_wallet_notification.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 
-import 'package:datadashwallet/core/src/firebase/firebase.dart';
+import 'package:moonchain_wallet/core/src/firebase/moonchain_wallet_firebase.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
@@ -8,13 +8,13 @@ import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 import 'package:http/http.dart' as http;
 
-class AXSNotification {
-  static AXSNotification? _instance;
+class MoonchainWalletNotification {
+  static MoonchainWalletNotification? _instance;
 
-  AXSNotification._();
+  MoonchainWalletNotification._();
 
-  factory AXSNotification() {
-    _instance ??= AXSNotification._();
+  factory MoonchainWalletNotification() {
+    _instance ??= MoonchainWalletNotification._();
     return _instance!;
   }
 
@@ -33,16 +33,18 @@ class AXSNotification {
       return;
     }
     channel = const AndroidNotificationChannel(
-      'axs_wallet_channel',
-      'AXS Notifications Cannel',
-      description: 'This channel is related to AXS wallet app notifications.',
+      'moonchain_wallet_channel',
+      'Moonchain wallet notifications Channel',
+      description:
+          'This channel is related to Moonchain wallet app notifications.',
       importance: Importance.high,
     );
 
     lowPriorityChannel = const AndroidNotificationChannel(
-      'axs_wallet_low_priority_channel',
-      'AXS low priority notifications channel',
-      description: 'This channel is related to AXS wallet app notifications.',
+      'moonchain_wallet_low_priority_channel',
+      'Moonchain wallet low priority notifications channel',
+      description:
+          'This channel is related to Moonchain wallet app notifications.',
       importance: Importance.low,
     );
 
@@ -60,7 +62,8 @@ class AXSNotification {
     /// Update the iOS foreground notification presentation options to allow
     /// heads up notifications.
     if (shouldInitFirebase) {
-      await AXSFireBase.setForegroundNotificationPresentationOptions();
+      await MoonchainWalletFireBase
+          .setForegroundNotificationPresentationOptions();
     }
 
     isFlutterLocalNotificationsInitialized = true;
@@ -74,7 +77,8 @@ class AXSNotification {
     if (imageUrl != null) {
       final http.Response response = await http.get(Uri.parse(imageUrl));
       largeImage = ByteArrayAndroidBitmap.fromBase64String(
-          base64Encode(response.bodyBytes));
+        base64Encode(response.bodyBytes),
+      );
     }
     if (notification != null && android != null && !kIsWeb) {
       flutterLocalNotificationsPlugin.show(
@@ -85,14 +89,14 @@ class AXSNotification {
           android: AndroidNotificationDetails(
             channel.id,
             channel.name,
-            groupKey: 'axs_wallet',
+            groupKey: 'moonchain_wallet',
             channelDescription: channel.description,
             importance: Importance.high,
             priority: Priority.high,
             playSound: true,
             visibility: NotificationVisibility.public,
-            icon: 'axs_logo',
-            color: ColorsTheme.primary300,
+            icon: 'moonchain_logo',
+            color: Colors.black,
             largeIcon: largeImage,
           ),
         ),
@@ -113,14 +117,14 @@ class AXSNotification {
         text,
         NotificationDetails(
           android: AndroidNotificationDetails(channel.id, channel.name,
-              groupKey: 'axs_wallet',
+              groupKey: 'moonchain_wallet',
               channelDescription: channel.description,
               importance: Importance.high,
               priority: Priority.high,
               playSound: true,
               visibility: NotificationVisibility.public,
-              icon: 'axs_logo',
-              color: ColorsTheme.primary300,
+              icon: 'moonchain_logo',
+              color: Colors.black,
               largeIcon: null,
               styleInformation: bigTextStyleInformation),
         ),
@@ -141,14 +145,14 @@ class AXSNotification {
         NotificationDetails(
           android: AndroidNotificationDetails(
               lowPriorityChannel.id, lowPriorityChannel.name,
-              groupKey: 'axs_wallet_low_priority',
+              groupKey: 'moonchain_wallet_low_priority',
               channelDescription: channel.description,
               importance: Importance.low,
               priority: Priority.low,
               playSound: true,
               visibility: NotificationVisibility.public,
-              icon: 'axs_logo',
-              color: ColorsTheme.primary300,
+              icon: 'moonchain_logo',
+              color: Colors.black,
               largeIcon: null,
               styleInformation: bigTextStyleInformation),
         ),
diff --git a/lib/core/src/pagination_list.dart b/lib/core/src/pagination_list.dart
index d0a75073..1197e4e0 100644
--- a/lib/core/src/pagination_list.dart
+++ b/lib/core/src/pagination_list.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:mxc_logic/mxc_logic.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 
 typedef PaginationLoader<T> = Future<ListWithTotal<T>> Function(
     int offset, int limit);
diff --git a/lib/core/src/providers/providers.dart b/lib/core/src/providers/providers.dart
index 7f618633..b114dcff 100644
--- a/lib/core/src/providers/providers.dart
+++ b/lib/core/src/providers/providers.dart
@@ -3,7 +3,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:mxc_logic/internal.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'package:path_provider/path_provider.dart';
-import 'package:datadashwallet/core/src/cached_types.dart';
+import 'package:moonchain_wallet/core/src/cached_types.dart';
 import '../cache/datadash_cache.dart';
 import '../cache/global_cache.dart';
 export 'providers_aliases.dart';
diff --git a/lib/core/src/providers/providers_use_cases.dart b/lib/core/src/providers/providers_use_cases.dart
index 8f1ad66c..85ae91c6 100644
--- a/lib/core/src/providers/providers_use_cases.dart
+++ b/lib/core/src/providers/providers_use_cases.dart
@@ -1,21 +1,21 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/common/components/recent_transactions/domain/mxc_transaction_use_case.dart';
-import 'package:datadashwallet/features/common/account/log_out_use_case.dart';
-import 'package:datadashwallet/features/common/common.dart';
-import 'package:datadashwallet/features/dapps/domain/domain.dart';
-import 'package:datadashwallet/features/errors/network_unavailable/network_unavailable_use_case.dart';
-import 'package:datadashwallet/features/portfolio/subfeatures/nft/domain/nfts_use_case.dart';
-import 'package:datadashwallet/features/settings/domain/app_version_use_case.dart';
-import 'package:datadashwallet/features/settings/subfeatures/address_book/address_book.dart';
-import 'package:datadashwallet/features/portfolio/subfeatures/token/add_token/domain/custom_tokens_use_case.dart';
-import 'package:datadashwallet/features/dapps/subfeatures/add_dapp/domain/bookmark_use_case.dart';
-import 'package:datadashwallet/features/portfolio/domain/portfolio_use_case.dart';
-import 'package:datadashwallet/features/security/security.dart';
-import 'package:datadashwallet/features/settings/subfeatures/dapp_hooks/domain/dapp_hooks_use_case.dart';
-import 'package:datadashwallet/features/settings/subfeatures/notifications/domain/background_fetch_config_use_case.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/common/components/recent_transactions/domain/mxc_transaction_use_case.dart';
+import 'package:moonchain_wallet/features/common/account/log_out_use_case.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
+import 'package:moonchain_wallet/features/dapps/domain/domain.dart';
+import 'package:moonchain_wallet/features/errors/network_unavailable/network_unavailable_use_case.dart';
+import 'package:moonchain_wallet/features/portfolio/subfeatures/nft/domain/nfts_use_case.dart';
+import 'package:moonchain_wallet/features/settings/domain/app_version_use_case.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/address_book/address_book.dart';
+import 'package:moonchain_wallet/features/portfolio/subfeatures/token/add_token/domain/custom_tokens_use_case.dart';
+import 'package:moonchain_wallet/features/dapps/subfeatures/add_dapp/domain/bookmark_use_case.dart';
+import 'package:moonchain_wallet/features/portfolio/domain/portfolio_use_case.dart';
+import 'package:moonchain_wallet/features/security/security.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/dapp_hooks/domain/dapp_hooks_use_case.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/notifications/domain/background_fetch_config_use_case.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/settings.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/settings.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
 final Provider<ThemeUseCase> themeUseCaseProvider = Provider(
diff --git a/lib/core/src/use_case/reactive_use_case.dart b/lib/core/src/use_case/reactive_use_case.dart
index ab292293..8a4f28b5 100644
--- a/lib/core/src/use_case/reactive_use_case.dart
+++ b/lib/core/src/use_case/reactive_use_case.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 
 import 'package:meta/meta.dart';
 import 'package:mxc_logic/mxc_logic.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 
 export 'package:rxdart/rxdart.dart';
 
diff --git a/lib/features/common/account/account_cache_repository.dart b/lib/features/common/account/account_cache_repository.dart
index 08f9ec6b..af576f49 100644
--- a/lib/features/common/account/account_cache_repository.dart
+++ b/lib/features/common/account/account_cache_repository.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
 class AccountCacheRepository extends GlobalCacheRepository {
diff --git a/lib/features/common/account/account_use_case.dart b/lib/features/common/account/account_use_case.dart
index d9696f8d..8edc3142 100644
--- a/lib/features/common/account/account_use_case.dart
+++ b/lib/features/common/account/account_use_case.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/common/account/account_cache_repository.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/common/account/account_cache_repository.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
 class AccountUseCase extends ReactiveUseCase {
diff --git a/lib/features/common/account/log_out_use_case.dart b/lib/features/common/account/log_out_use_case.dart
index 99c92756..b7a6a182 100644
--- a/lib/features/common/account/log_out_use_case.dart
+++ b/lib/features/common/account/log_out_use_case.dart
@@ -1,6 +1,6 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/security/security.dart';
-import 'package:datadashwallet/features/settings/settings.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/security/security.dart';
+import 'package:moonchain_wallet/features/settings/settings.dart';
 import 'package:f_logs/f_logs.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
diff --git a/lib/features/common/app/contextless_translation_use_case.dart b/lib/features/common/app/contextless_translation_use_case.dart
index 3dab3385..904dbf5d 100644
--- a/lib/features/common/app/contextless_translation_use_case.dart
+++ b/lib/features/common/app/contextless_translation_use_case.dart
@@ -2,8 +2,8 @@ import 'dart:convert';
 import 'dart:ui';
 import 'package:flutter/services.dart' show rootBundle;
 
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/settings.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/settings.dart';
 
 class ContextLessTranslationUseCase extends ReactiveUseCase {
   ContextLessTranslationUseCase(
diff --git a/lib/features/common/app/error_use_case.dart b/lib/features/common/app/error_use_case.dart
index 796192c6..e373d86d 100644
--- a/lib/features/common/app/error_use_case.dart
+++ b/lib/features/common/app/error_use_case.dart
@@ -1,10 +1,10 @@
 import 'dart:async';
 
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/common/common.dart';
-import 'package:datadashwallet/features/dapps/dapps.dart';
-import 'package:datadashwallet/features/settings/subfeatures/chain_configuration/domain/chain_configuration_use_case.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
+import 'package:moonchain_wallet/features/dapps/dapps.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/chain_configuration/domain/chain_configuration_use_case.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'package:web3dart/web3dart.dart';
@@ -41,7 +41,7 @@ class ErrorUseCase extends ReactiveUseCase {
       return true;
     }
 
-    AXSNotification().showNotification(
+    MoonchainWalletNotification().showNotification(
       notificationTitle,
       e.toString(),
     );
diff --git a/lib/features/common/app/function_use_case.dart b/lib/features/common/app/function_use_case.dart
index d14b9a98..059dec0b 100644
--- a/lib/features/common/app/function_use_case.dart
+++ b/lib/features/common/app/function_use_case.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/subfeatures/chain_configuration/domain/chain_configuration_use_case.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/chain_configuration/domain/chain_configuration_use_case.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
 class FunctionUseCase extends ReactiveUseCase {
@@ -22,7 +22,8 @@ class FunctionUseCase extends ReactiveUseCase {
   void mxcChainsAndEthereumFuncWrapper(
     Function func,
   ) {
-    if (_chainConfigurationUseCase.isMXCChains() || _chainConfigurationUseCase.isEthereumMainnet()) {
+    if (_chainConfigurationUseCase.isMXCChains() ||
+        _chainConfigurationUseCase.isEthereumMainnet()) {
       func();
     }
   }
diff --git a/lib/features/common/app/launcher_use_case.dart b/lib/features/common/app/launcher_use_case.dart
index 0385e123..47e76249 100644
--- a/lib/features/common/app/launcher_use_case.dart
+++ b/lib/features/common/app/launcher_use_case.dart
@@ -1,10 +1,10 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/common/common.dart';
-import 'package:datadashwallet/features/settings/subfeatures/chain_configuration/domain/chain_configuration_use_case.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/chain_configuration/domain/chain_configuration_use_case.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'package:open_file/open_file.dart';
 import 'package:path_provider/path_provider.dart';
@@ -100,23 +100,23 @@ class LauncherUseCase extends ReactiveUseCase {
     await launchUrlInExternalAppWithString(Urls.mxcZendesk);
   }
 
-  Future<void> launchMXCKnowledgeHub() async {
-    await launchUrlInExternalAppWithString(Urls.mxcKnowledgeHub);
+  Future<void> launchMoonchainWebsite() async {
+    await launchUrlInExternalAppWithString(Urls.moonchainWebsite);
   }
 
-  Future<void> launchMXCDesignDocs() async {
-    await launchUrlInExternalAppWithString(Urls.mxcDesignDocs);
+  Future<void> launchMoonchainDesignDocs() async {
+    await launchUrlInExternalAppWithString(Urls.moonchainDesignDocs);
   }
 
-  Future<void> launchAxsTermsConditions() async {
-    await launchUrlInExternalAppWithString(Urls.axsTermsConditions);
+  Future<void> launchMXCWalletTermsConditions() async {
+    await launchUrlInExternalAppWithString(Urls.mxcWalletTermsConditions);
   }
 
   void openTelegram() => launchUrlInPlatformDefaultWithString(Urls.telegram);
 
   void openWeChat() => launchUrlInPlatformDefaultWithString(Urls.weChat);
 
-  void openAXSPrivacy(String path) async {
+  void openMXCWalletPrivacy(String path) async {
     ByteData data = await rootBundle.load(path);
     List<int> bytes = data.buffer.asUint8List();
     String tempDir = (await getTemporaryDirectory()).path;
diff --git a/lib/features/common/app_nav_bar/app_nav_bar.dart b/lib/features/common/app_nav_bar/app_nav_bar.dart
index 76b6f66b..0eb28df5 100644
--- a/lib/features/common/app_nav_bar/app_nav_bar.dart
+++ b/lib/features/common/app_nav_bar/app_nav_bar.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/features/settings/settings.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/features/settings/settings.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:mxc_logic/mxc_logic.dart';
diff --git a/lib/features/common/app_nav_bar/app_nav_bar_presenter.dart b/lib/features/common/app_nav_bar/app_nav_bar_presenter.dart
index 840e3ec9..d5f1bb78 100644
--- a/lib/features/common/app_nav_bar/app_nav_bar_presenter.dart
+++ b/lib/features/common/app_nav_bar/app_nav_bar_presenter.dart
@@ -1,5 +1,5 @@
 import 'package:clipboard/clipboard.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
 import 'app_nav_bar_state.dart';
diff --git a/lib/features/common/contract/chains_use_case.dart b/lib/features/common/contract/chains_use_case.dart
index 927066d5..190b26a0 100644
--- a/lib/features/common/contract/chains_use_case.dart
+++ b/lib/features/common/contract/chains_use_case.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/subfeatures/chain_configuration/domain/chain_configuration_use_case.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/chain_configuration/domain/chain_configuration_use_case.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
 class ChainsUseCase extends ReactiveUseCase {
diff --git a/lib/features/common/contract/ipfs_gateway_use_case.dart b/lib/features/common/contract/ipfs_gateway_use_case.dart
index 8d54c0b2..6f0e5583 100644
--- a/lib/features/common/contract/ipfs_gateway_use_case.dart
+++ b/lib/features/common/contract/ipfs_gateway_use_case.dart
@@ -1,8 +1,8 @@
 import 'dart:async';
 
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/settings.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/settings.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
 class IPFSUseCase extends ReactiveUseCase {
diff --git a/lib/features/common/contract/miner_use_case.dart b/lib/features/common/contract/miner_use_case.dart
index 12ea9274..985a5f29 100644
--- a/lib/features/common/contract/miner_use_case.dart
+++ b/lib/features/common/contract/miner_use_case.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
 class MinerUseCase extends ReactiveUseCase {
diff --git a/lib/features/common/contract/mxc_websocket_use_case.dart b/lib/features/common/contract/mxc_websocket_use_case.dart
index b540b917..9f973108 100644
--- a/lib/features/common/contract/mxc_websocket_use_case.dart
+++ b/lib/features/common/contract/mxc_websocket_use_case.dart
@@ -1,11 +1,11 @@
 import 'dart:async';
 import 'dart:convert';
 
-import 'package:datadashwallet/app/app.dart';
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/common/common.dart';
-import 'package:datadashwallet/features/settings/subfeatures/chain_configuration/domain/chain_configuration_use_case.dart';
+import 'package:moonchain_wallet/app/app.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/chain_configuration/domain/chain_configuration_use_case.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
diff --git a/lib/features/common/contract/nft_contract_use_case.dart b/lib/features/common/contract/nft_contract_use_case.dart
index 2d4cc595..196eba22 100644
--- a/lib/features/common/contract/nft_contract_use_case.dart
+++ b/lib/features/common/contract/nft_contract_use_case.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
 class NftContractUseCase extends ReactiveUseCase {
@@ -51,9 +51,18 @@ class NftContractUseCase extends ReactiveUseCase {
         estimatedGasFee: estimatedGasFee,
       );
 
-  Future<List<Nft>?> getNftsByAddress(
+  Future<List<Nft>> getNftsByAddress(
     String address,
+    String ipfsGateWay,
   ) async {
-    return await _repository.nftContract.getNftsByAddress(address);
+    return await _repository.nftContract.getNftsByAddress(address, ipfsGateWay);
+  }
+
+  Future<List<Nft>> getDomainsByAddress(
+    String address,
+    String ipfsGateWay,
+  ) async {
+    return await _repository.nftContract
+        .getDomainsByAddress(address, ipfsGateWay);
   }
 }
diff --git a/lib/features/common/contract/pricing_use_case.dart b/lib/features/common/contract/pricing_use_case.dart
index d4155798..4479e943 100644
--- a/lib/features/common/contract/pricing_use_case.dart
+++ b/lib/features/common/contract/pricing_use_case.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
 class PricingUseCase extends ReactiveUseCase {
diff --git a/lib/features/common/contract/token_contract_use_case.dart b/lib/features/common/contract/token_contract_use_case.dart
index 283723ca..f87bbfdb 100644
--- a/lib/features/common/contract/token_contract_use_case.dart
+++ b/lib/features/common/contract/token_contract_use_case.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/common/common.dart';
-import 'package:datadashwallet/features/settings/subfeatures/chain_configuration/domain/chain_configuration_use_case.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/chain_configuration/domain/chain_configuration_use_case.dart';
 import 'package:flutter/services.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'package:web3dart/web3dart.dart';
@@ -269,12 +269,12 @@ class TokenContractUseCase extends ReactiveUseCase {
         .getTokenTransferData(tokenHash, toAddress, amount);
   }
 
-  String signPersonalMessage({required String privateKey, required String message}) {
+  String signPersonalMessage(
+      {required String privateKey, required String message}) {
     return _repository.tokenContract
         .signPersonalMessage(privateKey: privateKey, message: message);
   }
 
-
   String signMessage({required String privateKey, required String message}) {
     return _repository.tokenContract
         .signMessage(privateKey: privateKey, message: message);
diff --git a/lib/features/common/contract/transaction_controller.dart b/lib/features/common/contract/transaction_controller.dart
index 5dafa128..bc71a654 100644
--- a/lib/features/common/contract/transaction_controller.dart
+++ b/lib/features/common/contract/transaction_controller.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
 class TransactionControllerUseCase extends ReactiveUseCase {
diff --git a/lib/features/common/contract/tweets_use_case.dart b/lib/features/common/contract/tweets_use_case.dart
index 1a454b08..60cd789d 100644
--- a/lib/features/common/contract/tweets_use_case.dart
+++ b/lib/features/common/contract/tweets_use_case.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
 class TweetsUseCase extends ReactiveUseCase {
diff --git a/lib/features/common/packages/bluetooth/blue_plus/bluetooth_use_case.dart b/lib/features/common/packages/bluetooth/blue_plus/bluetooth_use_case.dart
index 43d44b2b..f9c8378d 100644
--- a/lib/features/common/packages/bluetooth/blue_plus/bluetooth_use_case.dart
+++ b/lib/features/common/packages/bluetooth/blue_plus/bluetooth_use_case.dart
@@ -6,8 +6,8 @@ import 'package:app_settings/app_settings.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/subfeatures/chain_configuration/domain/chain_configuration_use_case.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/chain_configuration/domain/chain_configuration_use_case.dart';
 
 class BluetoothTimeoutError extends Error {
   static const String message = 'unable_to_continue_bluetooth_is_turned_off';
diff --git a/lib/features/common/packages/bluetooth/blueberry_ring/domain/blueberry_ring_background_notifications_use_case.dart b/lib/features/common/packages/bluetooth/blueberry_ring/domain/blueberry_ring_background_notifications_use_case.dart
index efd5154a..487bcaed 100644
--- a/lib/features/common/packages/bluetooth/blueberry_ring/domain/blueberry_ring_background_notifications_use_case.dart
+++ b/lib/features/common/packages/bluetooth/blueberry_ring/domain/blueberry_ring_background_notifications_use_case.dart
@@ -1,9 +1,9 @@
 import 'dart:async';
-import 'package:datadashwallet/features/common/common.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/subfeatures/chain_configuration/domain/chain_configuration_use_case.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/chain_configuration/domain/chain_configuration_use_case.dart';
 
 import '../../../../../../app/logger.dart';
 
@@ -41,7 +41,7 @@ class BlueberryRingBackgroundNotificationsUseCase extends ReactiveUseCase {
         now.day == lastDate.day;
 
     if (isToday && latestData.step < 5000) {
-      AXSNotification().showNotification(
+      MoonchainWalletNotification().showNotification(
         cTranslate('activity_reminder'),
         cTranslate('blueberry_ring_inactive_alert_text'),
       );
@@ -75,7 +75,7 @@ class BlueberryRingBackgroundNotificationsUseCase extends ReactiveUseCase {
         todaysData.map((e) => e.value).toList());
 
     if (!isNormal) {
-      AXSNotification().showNotification(
+      MoonchainWalletNotification().showNotification(
         cTranslate('sleep_insight'),
         cTranslate('blueberry_ring_sleep_alert_text'),
       );
@@ -96,7 +96,7 @@ class BlueberryRingBackgroundNotificationsUseCase extends ReactiveUseCase {
         now.day == lastDate.day;
 
     if (isToday && latestData.value >= 100) {
-      AXSNotification().showNotification(
+      MoonchainWalletNotification().showNotification(
         cTranslate('heart_alert'),
         cTranslate('blueberry_ring_heart_rate_alert_text'),
       );
@@ -109,7 +109,7 @@ class BlueberryRingBackgroundNotificationsUseCase extends ReactiveUseCase {
     // What si the low battery level
     // Is 10 OK
     if (data < 20) {
-      AXSNotification().showNotification(
+      MoonchainWalletNotification().showNotification(
         cTranslate('low_battery'),
         cTranslate('blueberry_ring_battery_alert_text'),
       );
diff --git a/lib/features/common/packages/bluetooth/blueberry_ring/domain/blueberry_ring_background_sync_use_case.dart b/lib/features/common/packages/bluetooth/blueberry_ring/domain/blueberry_ring_background_sync_use_case.dart
index b12c42ce..046f12b6 100644
--- a/lib/features/common/packages/bluetooth/blueberry_ring/domain/blueberry_ring_background_sync_use_case.dart
+++ b/lib/features/common/packages/bluetooth/blueberry_ring/domain/blueberry_ring_background_sync_use_case.dart
@@ -1,10 +1,10 @@
 import 'dart:async';
 import 'dart:convert';
-import 'package:datadashwallet/features/common/common.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/subfeatures/chain_configuration/domain/chain_configuration_use_case.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/chain_configuration/domain/chain_configuration_use_case.dart';
 
 import '../../../../../../app/logger.dart';
 
@@ -24,12 +24,10 @@ class BlueberryRingBackgroundSyncUseCase extends ReactiveUseCase {
   final AccountUseCase _accountUserCase;
   final ContextLessTranslationUseCase _contextLessTranslationUseCase;
 
-
   // Context less translation, This should be only used for BG functions
   String cTranslate(String key) =>
       _contextLessTranslationUseCase.translate(key);
 
-
   Future<bool> syncRings({
     required List<String> selectedRingsListId,
     required Account account,
@@ -39,12 +37,12 @@ class BlueberryRingBackgroundSyncUseCase extends ReactiveUseCase {
     )
         translate,
   }) async {
-                 // Get miner from cache 
-        // for (String ring in selectedRings) { 
-          
-        // }
-    // Get rings list 
-        // Get the data from contract 
+    // Get miner from cache
+    // for (String ring in selectedRings) {
+
+    // }
+    // Get rings list
+    // Get the data from contract
 //         async function arrayFilterDate<T>(array: T[], date?: number) {
 //   if (!date)
 //     return array
@@ -53,7 +51,7 @@ class BlueberryRingBackgroundSyncUseCase extends ReactiveUseCase {
 // arrayFilterDate(arr, detail.steps.at(-1)?.date)
 // List<T> arrayFilterDate<T>(List<T> array, {int? date}) {
 //   if (date == null) return array;
-  
+
 //   return array.where((item) {
 //     var itemDate = (item as dynamic).date; // Use 'dynamic' to access the 'date' property
 //     return itemDate > (date ?? 0);
@@ -65,11 +63,11 @@ class BlueberryRingBackgroundSyncUseCase extends ReactiveUseCase {
     //       .replaceFirst('{0}', miner.mep1004TokenId!),
     //   null,
     // );
-  // no_rings_owned_notification
-  // syncing_data_from_ring
-  // already_synced_ring
-  // data_synced_successfully_ring
-  // data_syncing_failed
+    // no_rings_owned_notification
+    // syncing_data_from_ring
+    // already_synced_ring
+    // data_synced_successfully_ring
+    // data_syncing_failed
     // final memo = await fetchRingData();
 
     // final postClaimRequest = PostClaimRequestModel(
@@ -91,12 +89,11 @@ class BlueberryRingBackgroundSyncUseCase extends ReactiveUseCase {
     return true;
   }
 
-  Future<void> syncRing(BlueberryRingMiner ring) async{}
-
+  Future<void> syncRing(BlueberryRingMiner ring) async {}
 
   Future<String> fetchRingData() async {
     collectLog('fetchRingData');
-    
+
     final sleep = await _blueberryRingUseCase.readSleep();
     final bloodOxygens = await _blueberryRingUseCase.readBloodOxygens();
     final steps = await _blueberryRingUseCase.readSteps();
@@ -109,7 +106,6 @@ class BlueberryRingBackgroundSyncUseCase extends ReactiveUseCase {
       'bloodOxygens': bloodOxygens.map((e) => e.toJson()).toList(),
     };
 
-
     final content = json.encode(data);
 
     collectLog('fetchRingData:content : $content');
@@ -140,5 +136,4 @@ class BlueberryRingBackgroundSyncUseCase extends ReactiveUseCase {
     final returnDataJson = json.encode(returndataMap);
     return returnDataJson;
   }
-
 }
diff --git a/lib/features/common/packages/bluetooth/blueberry_ring/domain/blueberry_ring_use_case.dart b/lib/features/common/packages/bluetooth/blueberry_ring/domain/blueberry_ring_use_case.dart
index 3d1b34f8..1e8ba2c5 100644
--- a/lib/features/common/packages/bluetooth/blueberry_ring/domain/blueberry_ring_use_case.dart
+++ b/lib/features/common/packages/bluetooth/blueberry_ring/domain/blueberry_ring_use_case.dart
@@ -1,14 +1,14 @@
 import 'dart:async';
 import 'dart:typed_data';
 
-import 'package:datadashwallet/app/logger.dart';
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/app/logger.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/subfeatures/chain_configuration/domain/chain_configuration_use_case.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/chain_configuration/domain/chain_configuration_use_case.dart';
 
 import '../../bluetooth.dart';
 
diff --git a/lib/features/common/packages/bluetooth/blueberry_ring/utils/blueberry_configs.dart b/lib/features/common/packages/bluetooth/blueberry_ring/utils/blueberry_configs.dart
index 4757063b..c6274478 100644
--- a/lib/features/common/packages/bluetooth/blueberry_ring/utils/blueberry_configs.dart
+++ b/lib/features/common/packages/bluetooth/blueberry_ring/utils/blueberry_configs.dart
@@ -2,7 +2,7 @@ import 'dart:typed_data';
 
 // import 'package:dayjs/dayjs.dart';
 import 'package:collection/collection.dart';
-import 'package:datadashwallet/features/common/common.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
 
 typedef GetType = String Function();
 
diff --git a/lib/features/dapps/dapps.dart b/lib/features/dapps/dapps.dart
index b731cbf1..6d59b1dc 100644
--- a/lib/features/dapps/dapps.dart
+++ b/lib/features/dapps/dapps.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:flutter/material.dart';
 
 import 'subfeatures/open_dapp/open_dapp_page.dart';
diff --git a/lib/features/dapps/domain/dapp_store_use_case.dart b/lib/features/dapps/domain/dapp_store_use_case.dart
index d1846250..1c26aa08 100644
--- a/lib/features/dapps/domain/dapp_store_use_case.dart
+++ b/lib/features/dapps/domain/dapp_store_use_case.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
 class DappStoreUseCase extends ReactiveUseCase {
diff --git a/lib/features/dapps/domain/dapps_order_repository.dart b/lib/features/dapps/domain/dapps_order_repository.dart
index 7cd3fc82..39df3cf9 100644
--- a/lib/features/dapps/domain/dapps_order_repository.dart
+++ b/lib/features/dapps/domain/dapps_order_repository.dart
@@ -1,5 +1,5 @@
 import 'package:mxc_logic/mxc_logic.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 
 class DappsOrderRepository extends ControlledCacheRepository {
   @override
diff --git a/lib/features/dapps/domain/dapps_order_use_case.dart b/lib/features/dapps/domain/dapps_order_use_case.dart
index 702eb94f..6e348025 100644
--- a/lib/features/dapps/domain/dapps_order_use_case.dart
+++ b/lib/features/dapps/domain/dapps_order_use_case.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
 import 'dapps_order_repository.dart';
diff --git a/lib/features/dapps/domain/gestures_instruction_repository.dart b/lib/features/dapps/domain/gestures_instruction_repository.dart
index 1bbc62ec..d530a71c 100644
--- a/lib/features/dapps/domain/gestures_instruction_repository.dart
+++ b/lib/features/dapps/domain/gestures_instruction_repository.dart
@@ -1,5 +1,5 @@
 import 'package:mxc_logic/mxc_logic.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 
 class GesturesInstructionRepository extends GlobalCacheRepository {
   @override
diff --git a/lib/features/dapps/domain/gestures_instruction_use_case.dart b/lib/features/dapps/domain/gestures_instruction_use_case.dart
index f3fec9f0..f91e21c0 100644
--- a/lib/features/dapps/domain/gestures_instruction_use_case.dart
+++ b/lib/features/dapps/domain/gestures_instruction_use_case.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 
 import 'gestures_instruction_repository.dart';
 
diff --git a/lib/features/dapps/helpers/book_marks_helper.dart b/lib/features/dapps/helpers/book_marks_helper.dart
index 23021219..880c9b5a 100644
--- a/lib/features/dapps/helpers/book_marks_helper.dart
+++ b/lib/features/dapps/helpers/book_marks_helper.dart
@@ -1,8 +1,8 @@
 import 'dart:io';
 
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/src/routing/route.dart';
-import 'package:datadashwallet/features/dapps/subfeatures/add_dapp/domain/bookmark_use_case.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/src/routing/route.dart';
+import 'package:moonchain_wallet/features/dapps/subfeatures/add_dapp/domain/bookmark_use_case.dart';
 import 'package:favicon/favicon.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_logic/mxc_logic.dart';
diff --git a/lib/features/dapps/helpers/permissions_helpers.dart b/lib/features/dapps/helpers/permissions_helpers.dart
index fe1a98d5..5e93f821 100644
--- a/lib/features/dapps/helpers/permissions_helpers.dart
+++ b/lib/features/dapps/helpers/permissions_helpers.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:geolocator/geolocator.dart' as geo;
 import 'package:flutter/material.dart';
 import 'package:mxc_logic/mxc_logic.dart';
diff --git a/lib/features/dapps/helpers/reorder_helper.dart b/lib/features/dapps/helpers/reorder_helper.dart
index 255c20e5..b1bbbff0 100644
--- a/lib/features/dapps/helpers/reorder_helper.dart
+++ b/lib/features/dapps/helpers/reorder_helper.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/features/dapps/presentation/responsive_layout/dapp_utils.dart';
+import 'package:moonchain_wallet/features/dapps/presentation/responsive_layout/dapp_utils.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
 import '../domain/domain.dart';
diff --git a/lib/features/dapps/presentation/dapps_page.dart b/lib/features/dapps/presentation/dapps_page.dart
index 5abdd1d5..4d3d7a72 100644
--- a/lib/features/dapps/presentation/dapps_page.dart
+++ b/lib/features/dapps/presentation/dapps_page.dart
@@ -1,6 +1,6 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/features/dapps/presentation/widgets/default_app_bar.dart';
-import 'package:datadashwallet/features/dapps/presentation/widgets/edit_mode_app_bar.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/features/dapps/presentation/widgets/default_app_bar.dart';
+import 'package:moonchain_wallet/features/dapps/presentation/widgets/edit_mode_app_bar.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:mxc_ui/mxc_ui.dart';
@@ -27,14 +27,7 @@ class DAppsPage extends HookConsumerWidget {
       useContentPadding: false,
       childrenPadding: const EdgeInsets.symmetric(
           horizontal: Sizes.spaceSmall, vertical: Sizes.spaceNormal),
-      backgroundGradient: const LinearGradient(
-        colors: [
-          Color(0xFF0E1629),
-          Color(0xFF333333),
-        ],
-        begin: Alignment.topLeft,
-        end: Alignment.bottomRight,
-      ),
+      useGradientBackground: true,
       presenter: ref.watch(presenter),
       appBar: Column(
         children: [
diff --git a/lib/features/dapps/presentation/dapps_presenter.dart b/lib/features/dapps/presentation/dapps_presenter.dart
index f64aa16a..8121e324 100644
--- a/lib/features/dapps/presentation/dapps_presenter.dart
+++ b/lib/features/dapps/presentation/dapps_presenter.dart
@@ -1,9 +1,9 @@
 import 'dart:async';
 
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/dapps/dapps.dart';
-import 'package:datadashwallet/features/dapps/helpers/book_marks_helper.dart';
-import 'package:datadashwallet/features/dapps/helpers/helpers.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/dapps/dapps.dart';
+import 'package:moonchain_wallet/features/dapps/helpers/book_marks_helper.dart';
+import 'package:moonchain_wallet/features/dapps/helpers/helpers.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:mxc_logic/mxc_logic.dart';
diff --git a/lib/features/dapps/presentation/responsive_layout/dapp_card_layout.dart b/lib/features/dapps/presentation/responsive_layout/dapp_card_layout.dart
index 9fd4c7d2..e8a066e0 100644
--- a/lib/features/dapps/presentation/responsive_layout/dapp_card_layout.dart
+++ b/lib/features/dapps/presentation/responsive_layout/dapp_card_layout.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/features/dapps/presentation/dapps_presenter.dart';
+import 'package:moonchain_wallet/features/dapps/presentation/dapps_presenter.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:mxc_logic/mxc_logic.dart';
diff --git a/lib/features/dapps/presentation/responsive_layout/dapps_layout/context_menu_actions.dart b/lib/features/dapps/presentation/responsive_layout/dapps_layout/context_menu_actions.dart
index 2484386a..dac1ca25 100644
--- a/lib/features/dapps/presentation/responsive_layout/dapps_layout/context_menu_actions.dart
+++ b/lib/features/dapps/presentation/responsive_layout/dapps_layout/context_menu_actions.dart
@@ -86,23 +86,28 @@ getBookMarkContextMenuAction(
         ],
       )),
       CupertinoContextMenuAction(
-          trailingIcon: Icons.phone_iphone_rounded,
-          child: Text(FlutterI18n.translate(context, 'edit_home_screen'),
-              style: FontTheme.of(context).body1()),
-          onPressed: () => popWrapper(actions.changeEditMode, context)),
+        trailingIcon: Icons.phone_iphone_rounded,
+        child: Text(FlutterI18n.translate(context, 'edit_home_screen'),
+            style: FontTheme.of(context).body1()),
+        onPressed: () => popWrapper(actions.changeEditMode, context),
+      ),
       CupertinoContextMenuAction(
-          trailingIcon: Icons.add_circle_outline_rounded,
-          child: Text(FlutterI18n.translate(context, 'add_new_dapp'),
-              style: FontTheme.of(context).body1()),
-          onPressed: () => popWrapper(actions.addBookmark, context)),
+        trailingIcon: Icons.add_circle_outline_rounded,
+        child: Text(FlutterI18n.translate(context, 'add_new_dapp'),
+            style: FontTheme.of(context).body1()),
+        onPressed: () => popWrapper(actions.addBookmark, context),
+      ),
       CupertinoContextMenuAction(
-          isDestructiveAction: true,
-          trailingIcon: Icons.remove_circle_outline_rounded,
-          onPressed: () => popWrapper(() async {
-                actions.removeBookmarkDialog(dapp as Bookmark, shatter);
-              }, context),
-          child: Text(FlutterI18n.translate(context, 'remove_dapp'),
-              style: FontTheme.of(context).body1Cl()))
+        isDestructiveAction: true,
+        trailingIcon: Icons.remove_circle_outline_rounded,
+        onPressed: () => popWrapper(() async {
+          actions.removeBookmarkDialog(dapp as Bookmark, shatter);
+        }, context),
+        child: Text(
+          FlutterI18n.translate(context, 'remove_dapp'),
+          style: FontTheme.of(context).body1Cl(),
+        ),
+      ),
     ];
 
 void popWrapper(void Function()? func, BuildContext context) {
diff --git a/lib/features/dapps/presentation/responsive_layout/dapps_layout/dapp_card.dart b/lib/features/dapps/presentation/responsive_layout/dapps_layout/dapp_card.dart
index b4e86f81..eae1a41d 100644
--- a/lib/features/dapps/presentation/responsive_layout/dapps_layout/dapp_card.dart
+++ b/lib/features/dapps/presentation/responsive_layout/dapps_layout/dapp_card.dart
@@ -1,6 +1,6 @@
 import 'dart:math';
 
-import 'package:datadashwallet/common/components/context_menu_extended.dart';
+import 'package:moonchain_wallet/common/components/context_menu_extended.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
diff --git a/lib/features/dapps/presentation/widgets/default_app_bar.dart b/lib/features/dapps/presentation/widgets/default_app_bar.dart
index 74d4b553..160d1c4f 100644
--- a/lib/features/dapps/presentation/widgets/default_app_bar.dart
+++ b/lib/features/dapps/presentation/widgets/default_app_bar.dart
@@ -1,11 +1,10 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/common/common.dart';
-import 'package:datadashwallet/features/settings/presentation/settings_page.dart';
-import 'package:datadashwallet/features/wallet/presentation/wallet_page.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
+import 'package:moonchain_wallet/features/settings/presentation/settings_page.dart';
+import 'package:moonchain_wallet/features/wallet/presentation/wallet_page.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 
-
 class DefaultAppBar extends StatelessWidget {
   const DefaultAppBar({super.key});
 
@@ -17,7 +16,6 @@ class DefaultAppBar extends StatelessWidget {
         icon: const Icon(MxcIcons.settings),
         iconSize: Sizes.space2XLarge,
         onPressed: () {
-          
           Navigator.of(context).push(
             route(
               const SettingsPage(),
diff --git a/lib/features/dapps/presentation/widgets/edit_mode_app_bar.dart b/lib/features/dapps/presentation/widgets/edit_mode_app_bar.dart
index 37d6a2ec..8b641aa8 100644
--- a/lib/features/dapps/presentation/widgets/edit_mode_app_bar.dart
+++ b/lib/features/dapps/presentation/widgets/edit_mode_app_bar.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/features/common/common.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
diff --git a/lib/features/dapps/subfeatures/add_dapp/domain/bookmark_repository.dart b/lib/features/dapps/subfeatures/add_dapp/domain/bookmark_repository.dart
index f4d00119..def4c3ac 100644
--- a/lib/features/dapps/subfeatures/add_dapp/domain/bookmark_repository.dart
+++ b/lib/features/dapps/subfeatures/add_dapp/domain/bookmark_repository.dart
@@ -1,5 +1,5 @@
 import 'package:mxc_logic/mxc_logic.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 
 class BookmarkRepository extends GlobalCacheRepository {
   @override
diff --git a/lib/features/dapps/subfeatures/add_dapp/domain/bookmark_use_case.dart b/lib/features/dapps/subfeatures/add_dapp/domain/bookmark_use_case.dart
index eda7f828..0a050930 100644
--- a/lib/features/dapps/subfeatures/add_dapp/domain/bookmark_use_case.dart
+++ b/lib/features/dapps/subfeatures/add_dapp/domain/bookmark_use_case.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'bookmark_repository.dart';
 
diff --git a/lib/features/dapps/subfeatures/add_dapp/presentation/add_bookmark.dart b/lib/features/dapps/subfeatures/add_dapp/presentation/add_bookmark.dart
index 98ab85ae..4688def0 100644
--- a/lib/features/dapps/subfeatures/add_dapp/presentation/add_bookmark.dart
+++ b/lib/features/dapps/subfeatures/add_dapp/presentation/add_bookmark.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
diff --git a/lib/features/dapps/subfeatures/add_dapp/presentation/add_bookmark_presenter.dart b/lib/features/dapps/subfeatures/add_dapp/presentation/add_bookmark_presenter.dart
index cacfeadf..f8c1f7ee 100644
--- a/lib/features/dapps/subfeatures/add_dapp/presentation/add_bookmark_presenter.dart
+++ b/lib/features/dapps/subfeatures/add_dapp/presentation/add_bookmark_presenter.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:favicon/favicon.dart';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart' as http;
diff --git a/lib/features/dapps/subfeatures/open_dapp/domain/helpers/bridge/bridge_functions_helper.dart b/lib/features/dapps/subfeatures/open_dapp/domain/helpers/bridge/bridge_functions_helper.dart
index d010bf28..98276e61 100644
--- a/lib/features/dapps/subfeatures/open_dapp/domain/helpers/bridge/bridge_functions_helper.dart
+++ b/lib/features/dapps/subfeatures/open_dapp/domain/helpers/bridge/bridge_functions_helper.dart
@@ -1,9 +1,9 @@
 import 'dart:typed_data';
 
-import 'package:datadashwallet/common/components/components.dart';
-import 'package:datadashwallet/features/common/common.dart';
-import 'package:datadashwallet/features/portfolio/subfeatures/token/add_token/domain/custom_tokens_use_case.dart';
-import 'package:datadashwallet/features/settings/settings.dart';
+import 'package:moonchain_wallet/common/components/components.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
+import 'package:moonchain_wallet/features/portfolio/subfeatures/token/add_token/domain/custom_tokens_use_case.dart';
+import 'package:moonchain_wallet/features/settings/settings.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
diff --git a/lib/features/dapps/subfeatures/open_dapp/domain/helpers/bridge/bridge_helper.dart b/lib/features/dapps/subfeatures/open_dapp/domain/helpers/bridge/bridge_helper.dart
index a9aa07e3..a08b0f44 100644
--- a/lib/features/dapps/subfeatures/open_dapp/domain/helpers/bridge/bridge_helper.dart
+++ b/lib/features/dapps/subfeatures/open_dapp/domain/helpers/bridge/bridge_helper.dart
@@ -1,8 +1,8 @@
 import 'dart:convert';
 
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/src/providers/providers.dart';
-import 'package:datadashwallet/features/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/src/providers/providers.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
 
 import 'package:flutter/material.dart';
 import 'package:mxc_logic/mxc_logic.dart';
@@ -187,7 +187,6 @@ class BridgeHelper {
     }
   }
 
-
   void signMessage({
     required Map<String, dynamic> object,
     required VoidCallback cancel,
@@ -196,7 +195,7 @@ class BridgeHelper {
     final hexData = object['data'] as String;
     String message = MXCType.hexToString(hexData);
     int chainId = state.network!.chainId;
-    String name = state.network!.symbol;
+    String name = state.network!.label ?? state.network!.symbol;
 
     try {
       final result = await showSignMessageDialog(
@@ -220,7 +219,6 @@ class BridgeHelper {
     }
   }
 
-  
   void signPersonalMessage({
     required Map<String, dynamic> object,
     required VoidCallback cancel,
@@ -229,7 +227,7 @@ class BridgeHelper {
     final hexData = object['data'] as String;
     String message = MXCType.hexToString(hexData);
     int chainId = state.network!.chainId;
-    String name = state.network!.symbol;
+    String name = state.network!.label ?? state.network!.symbol;
 
     try {
       final result = await showSignMessageDialog(
diff --git a/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/bluetooth_helper.dart b/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/bluetooth_helper.dart
index 30077e87..cce0d5bc 100644
--- a/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/bluetooth_helper.dart
+++ b/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/bluetooth_helper.dart
@@ -2,8 +2,8 @@ import 'dart:async';
 import 'dart:typed_data';
 
 import 'package:collection/collection.dart';
-import 'package:datadashwallet/features/common/common.dart';
-import 'package:datadashwallet/features/settings/subfeatures/dapp_hooks/dapp_hooks.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/dapp_hooks/dapp_hooks.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart' as blue_plus;
diff --git a/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/bluetooth_listeners_helper.dart b/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/bluetooth_listeners_helper.dart
index a0b81953..1bfb409a 100644
--- a/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/bluetooth_listeners_helper.dart
+++ b/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/bluetooth_listeners_helper.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/subfeatures/dapp_hooks/dapp_hooks.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/dapp_hooks/dapp_hooks.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
diff --git a/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/cron_helper.dart b/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/cron_helper.dart
index a4f9ee78..23a27b49 100644
--- a/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/cron_helper.dart
+++ b/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/cron_helper.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/subfeatures/dapp_hooks/dapp_hooks.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/dapp_hooks/dapp_hooks.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
diff --git a/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/js_channel_handlers_helper.dart b/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/js_channel_handlers_helper.dart
index 493b3975..6af801cd 100644
--- a/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/js_channel_handlers_helper.dart
+++ b/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/js_channel_handlers_helper.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 
-import 'package:datadashwallet/features/common/packages/bluetooth/bluetooth.dart';
+import 'package:moonchain_wallet/features/common/packages/bluetooth/bluetooth.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
@@ -11,15 +11,13 @@ class JsChannelHandlersHelper {
     required this.state,
     required this.context,
     required this.translate,
-        required this.addError,
+    required this.addError,
   });
 
   OpenDAppState state;
   BuildContext? context;
   String? Function(String) translate;
-    void Function(dynamic error, [StackTrace? stackTrace]) addError;
-
-
+  void Function(dynamic error, [StackTrace? stackTrace]) addError;
 
   Future<Map<String, dynamic>> jsChannelCronErrorHandler(
     List<dynamic> args,
diff --git a/lib/features/dapps/subfeatures/open_dapp/domain/utils/bluetooth_entities_utils.dart b/lib/features/dapps/subfeatures/open_dapp/domain/utils/bluetooth_entities_utils.dart
index e4782644..138d5be7 100644
--- a/lib/features/dapps/subfeatures/open_dapp/domain/utils/bluetooth_entities_utils.dart
+++ b/lib/features/dapps/subfeatures/open_dapp/domain/utils/bluetooth_entities_utils.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/features/common/packages/bluetooth/blue_plus/blue_plus.dart';
+import 'package:moonchain_wallet/features/common/packages/bluetooth/blue_plus/blue_plus.dart';
 
 import '../../open_dapp.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart' as blue_plus;
diff --git a/lib/features/dapps/subfeatures/open_dapp/domain/utils/js_channel_utils.dart b/lib/features/dapps/subfeatures/open_dapp/domain/utils/js_channel_utils.dart
index 45746ffa..65081cee 100644
--- a/lib/features/dapps/subfeatures/open_dapp/domain/utils/js_channel_utils.dart
+++ b/lib/features/dapps/subfeatures/open_dapp/domain/utils/js_channel_utils.dart
@@ -3,9 +3,7 @@ import 'package:mxc_logic/mxc_logic.dart';
 import '../../open_dapp.dart';
 
 class JSChannelUtils {
-
-
-  static void injectAXSWalletJSChannel(OpenDAppState state) async {
+  static void injectMXCWalletJSChannel(OpenDAppState state) async {
     // Making It easy for accessing axs wallet
     // use this way window.axs.callHandler
     await state.webviewController!.evaluateJavascript(
diff --git a/lib/features/dapps/subfeatures/open_dapp/domain/utils/panel_utils.dart b/lib/features/dapps/subfeatures/open_dapp/domain/utils/panel_utils.dart
index 941c409b..02b075d6 100644
--- a/lib/features/dapps/subfeatures/open_dapp/domain/utils/panel_utils.dart
+++ b/lib/features/dapps/subfeatures/open_dapp/domain/utils/panel_utils.dart
@@ -11,11 +11,11 @@ const cancelDuration = Duration(milliseconds: 400);
 
 class PanelUtils {
   static void showPanel(OpenDAppState state, Timer? panelTimer) async {
-    final status = state.animationController!.status;
-    if (state.animationController!.value != 1 &&
+    final status = state.animationController?.status;
+    if (state.animationController?.value != 1 &&
             status == AnimationStatus.completed ||
         status == AnimationStatus.dismissed) {
-      await state.animationController!.animateTo(
+      await state.animationController?.animateTo(
         1.0,
         duration: settleDuration,
         curve: Curves.ease,
@@ -28,10 +28,10 @@ class PanelUtils {
   }
 
   static void hidePanel(OpenDAppState state, Timer? panelTimer) async {
-    final status = state.animationController!.status;
-    if (state.animationController!.value != 0 &&
+    final status = state.animationController?.status;
+    if (state.animationController?.value != 0 &&
         status == AnimationStatus.completed) {
-      await state.animationController!.animateTo(
+      await state.animationController?.animateTo(
         0.0,
         duration: cancelDuration,
         curve: Curves.easeInExpo,
diff --git a/lib/features/dapps/subfeatures/open_dapp/open_dapp_page.dart b/lib/features/dapps/subfeatures/open_dapp/open_dapp_page.dart
index a73f60fa..2a394627 100644
--- a/lib/features/dapps/subfeatures/open_dapp/open_dapp_page.dart
+++ b/lib/features/dapps/subfeatures/open_dapp/open_dapp_page.dart
@@ -1,6 +1,6 @@
-import 'package:datadashwallet/app/logger.dart';
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/features/dapps/subfeatures/open_dapp/widgets/drag_down_panel.dart';
+import 'package:moonchain_wallet/app/logger.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/features/dapps/subfeatures/open_dapp/widgets/drag_down_panel.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
@@ -82,7 +82,7 @@ class OpenAppPage extends HookConsumerWidget {
                       presenter.injectCopyHandling();
                       presenter.injectScrollDetector();
                       if (!state.isLoadStopCalled) {
-                        presenter.injectAXSWalletJSChannel();
+                        presenter.injectMXCWalletJSChannel();
                         presenter.changeOnLoadStopCalled();
                       }
                     },
diff --git a/lib/features/dapps/subfeatures/open_dapp/open_dapp_presenter.dart b/lib/features/dapps/subfeatures/open_dapp/open_dapp_presenter.dart
index ab1c10b4..69c34faf 100644
--- a/lib/features/dapps/subfeatures/open_dapp/open_dapp_presenter.dart
+++ b/lib/features/dapps/subfeatures/open_dapp/open_dapp_presenter.dart
@@ -4,10 +4,10 @@ import 'package:flutter/services.dart';
 
 import 'package:clipboard/clipboard.dart';
 
-import 'package:datadashwallet/app/logger.dart';
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/subfeatures/dapp_hooks/utils/utils.dart';
+import 'package:moonchain_wallet/app/logger.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/dapp_hooks/utils/utils.dart';
 
 import 'package:mxc_logic/mxc_logic.dart';
 import 'package:web3_provider/web3_provider.dart';
@@ -158,6 +158,7 @@ class OpenDAppPresenter extends CompletePresenter<OpenDAppState> {
   Future<void> dispose() {
     cancelCharacteristicListenerTimer();
     closeBlueberryConnection();
+    state.animationController = null;
     return super.dispose();
   }
 
@@ -209,7 +210,7 @@ class OpenDAppPresenter extends CompletePresenter<OpenDAppState> {
     state.webviewController!
         .evaluateJavascript(source: JSChannelScripts.clipboardHandlerScript);
     state.webviewController!.addJavaScriptHandler(
-      handlerName: JSChannelEvents.axsWalletCopyClipboard,
+      handlerName: JSChannelEvents.mxcWalletCopyClipboard,
       callback: (args) {
         copy(args);
       },
@@ -272,7 +273,7 @@ class OpenDAppPresenter extends CompletePresenter<OpenDAppState> {
         .evaluateJavascript(source: JSChannelScripts.overScrollScript);
 
     state.webviewController!.addJavaScriptHandler(
-      handlerName: JSChannelEvents.axsWalletScrollDetector,
+      handlerName: JSChannelEvents.mxcWalletScrollDetector,
       callback: (args) {
         if (args[0] is bool) {
           args[0] == true ? showPanel() : hidePanel();
@@ -398,8 +399,8 @@ class OpenDAppPresenter extends CompletePresenter<OpenDAppState> {
   void changeOnLoadStopCalled() =>
       state.isLoadStopCalled = !state.isLoadStopCalled;
 
-  void injectAXSWalletJSChannel() =>
-      JSChannelUtils.injectAXSWalletJSChannel(state);
+  void injectMXCWalletJSChannel() =>
+      JSChannelUtils.injectMXCWalletJSChannel(state);
 
   void cancelCharacteristicListenerTimer() =>
       characteristicListenerTimer?.cancel();
diff --git a/lib/features/dapps/subfeatures/open_dapp/widgets/add_asset_dialog.dart b/lib/features/dapps/subfeatures/open_dapp/widgets/add_asset_dialog.dart
index 32af0ae0..37fafb09 100644
--- a/lib/features/dapps/subfeatures/open_dapp/widgets/add_asset_dialog.dart
+++ b/lib/features/dapps/subfeatures/open_dapp/widgets/add_asset_dialog.dart
@@ -1,4 +1,5 @@
-import 'package:datadashwallet/features/dapps/subfeatures/open_dapp/widgets/add_asset_info.dart';
+import 'package:moonchain_wallet/common/bottom_sheets/bottom_sheets.dart';
+import 'package:moonchain_wallet/features/dapps/subfeatures/open_dapp/widgets/add_asset_info.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'package:mxc_ui/mxc_ui.dart';
@@ -9,41 +10,27 @@ Future<bool?> showAddAssetDialog(
   required WatchAssetModel token,
   VoidCallback? onTap,
 }) {
-  return showModalBottomSheet<bool>(
+  return showBaseBottomSheet<bool>(
     context: context,
-    useRootNavigator: true,
-    isScrollControlled: true,
-    isDismissible: false,
-    backgroundColor: Colors.transparent,
-    builder: (BuildContext context) => Container(
-      padding: const EdgeInsets.only(left: 16, right: 16, top: 0, bottom: 44),
-      decoration: BoxDecoration(
-        color: ColorsTheme.of(context).screenBackground,
-        borderRadius: const BorderRadius.only(
-          topLeft: Radius.circular(20),
-          topRight: Radius.circular(20),
-        ),
-      ),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          MxcAppBarEvenly.title(
-            titleText: title ?? '',
-            action: Container(
-              alignment: Alignment.centerRight,
-              child: InkWell(
-                child: const Icon(Icons.close),
-                onTap: () => Navigator.of(context).pop(false),
-              ),
+    content: Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        MxcAppBarEvenly.title(
+          titleText: title ?? '',
+          action: Container(
+            alignment: Alignment.centerRight,
+            child: InkWell(
+              child: const Icon(Icons.close),
+              onTap: () => Navigator.of(context).pop(false),
             ),
           ),
-          AddAssetInfo(
-            token: token,
-            onTap: onTap,
-          ),
-          const SizedBox(height: 10),
-        ],
-      ),
+        ),
+        AddAssetInfo(
+          token: token,
+          onTap: onTap,
+        ),
+        const SizedBox(height: 10),
+      ],
     ),
   );
 }
diff --git a/lib/features/dapps/subfeatures/open_dapp/widgets/add_asset_info.dart b/lib/features/dapps/subfeatures/open_dapp/widgets/add_asset_info.dart
index 250a966d..d66a6878 100644
--- a/lib/features/dapps/subfeatures/open_dapp/widgets/add_asset_info.dart
+++ b/lib/features/dapps/subfeatures/open_dapp/widgets/add_asset_info.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/common/components/list/single_line_info_item.dart';
-import 'package:datadashwallet/common/utils/utils.dart';
+import 'package:moonchain_wallet/common/components/list/single_line_info_item.dart';
+import 'package:moonchain_wallet/common/utils/utils.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -40,11 +40,11 @@ class AddAssetInfo extends ConsumerWidget {
   Widget addTokenButton(BuildContext context) {
     String titleText = FlutterI18n.translate(context, 'add_x').replaceFirst(
         '{0}', FlutterI18n.translate(context, 'token').toLowerCase());
-    AxsButtonType type = AxsButtonType.primary;
+    MXCWalletButtonType type = MXCWalletButtonType.primary;
 
     return MxcButton.primary(
       key: const ValueKey('addTokenButton'),
-      size: AxsButtonSize.xl,
+      size: MXCWalletButtonSize.xl,
       title: titleText,
       type: type,
       onTap: () {
diff --git a/lib/features/dapps/subfeatures/open_dapp/widgets/drag_down_panel.dart b/lib/features/dapps/subfeatures/open_dapp/widgets/drag_down_panel.dart
index 77f501aa..6b3d0499 100644
--- a/lib/features/dapps/subfeatures/open_dapp/widgets/drag_down_panel.dart
+++ b/lib/features/dapps/subfeatures/open_dapp/widgets/drag_down_panel.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/features/settings/subfeatures/chain_configuration/widgets/chain_logo_widget.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/chain_configuration/widgets/chain_logo_widget.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
diff --git a/lib/features/dapps/subfeatures/open_dapp/widgets/message_info.dart b/lib/features/dapps/subfeatures/open_dapp/widgets/message_info.dart
index 5e48a36d..facead68 100644
--- a/lib/features/dapps/subfeatures/open_dapp/widgets/message_info.dart
+++ b/lib/features/dapps/subfeatures/open_dapp/widgets/message_info.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -40,11 +40,11 @@ class MessageInfo extends ConsumerWidget {
 
   Widget signButton(BuildContext context) {
     String titleText = 'sign';
-    AxsButtonType type = AxsButtonType.primary;
+    MXCWalletButtonType type = MXCWalletButtonType.primary;
 
     return MxcButton.primary(
       key: const ValueKey('signButton'),
-      size: AxsButtonSize.xl,
+      size: MXCWalletButtonSize.xl,
       title: FlutterI18n.translate(context, titleText),
       type: type,
       onTap: () {
@@ -72,7 +72,12 @@ class MessageInfo extends ConsumerWidget {
     );
   }
 
-  Widget messageItem(BuildContext context, OpenDAppPresenter presenter, String message) {
-    return SingleLineInfoItem(title: FlutterI18n.translate(context, 'message'), value: message);
+  Widget messageItem(
+      BuildContext context, OpenDAppPresenter presenter, String message) {
+    return SingleLineInfoItem(
+      title: FlutterI18n.translate(context, 'message'),
+      value: message,
+      valueAlign: TextAlign.start,
+    );
   }
 }
diff --git a/lib/features/dapps/subfeatures/open_dapp/widgets/sign_message_bottom_sheet.dart b/lib/features/dapps/subfeatures/open_dapp/widgets/sign_message_bottom_sheet.dart
index 74169c30..c1452510 100644
--- a/lib/features/dapps/subfeatures/open_dapp/widgets/sign_message_bottom_sheet.dart
+++ b/lib/features/dapps/subfeatures/open_dapp/widgets/sign_message_bottom_sheet.dart
@@ -1,3 +1,4 @@
+import 'package:moonchain_wallet/common/bottom_sheets/bottom_sheets.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 
@@ -10,43 +11,28 @@ Future<bool?> showSignMessageDialog(
   required String message,
   VoidCallback? onTap,
 }) {
-  return showModalBottomSheet<bool>(
+  return showBaseBottomSheet<bool>(
     context: context,
-    useRootNavigator: true,
-    isScrollControlled: true,
-    isDismissible: false,
-    useSafeArea: true,
-    backgroundColor: Colors.transparent,
-    builder: (BuildContext context) => Container(
-      padding: const EdgeInsets.only(left: 16, right: 16, top: 0, bottom: 44),
-      decoration: BoxDecoration(
-        color: ColorsTheme.of(context).screenBackground,
-        borderRadius: const BorderRadius.only(
-          topLeft: Radius.circular(20),
-          topRight: Radius.circular(20),
-        ),
-      ),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          MxcAppBarEvenly.title(
-            titleText: title ?? '',
-            action: Container(
-              alignment: Alignment.centerRight,
-              child: InkWell(
-                child: const Icon(Icons.close),
-                onTap: () => Navigator.of(context).pop(false),
-              ),
+    content: Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        MxcAppBarEvenly.title(
+          titleText: title ?? '',
+          action: Container(
+            alignment: Alignment.centerRight,
+            child: InkWell(
+              child: const Icon(Icons.close),
+              onTap: () => Navigator.of(context).pop(false),
             ),
           ),
-          MessageInfo(
-            message: message,
-            networkName: networkName,
-            onTap: onTap,
-          ),
-          const SizedBox(height: 10),
-        ],
-      ),
+        ),
+        MessageInfo(
+          message: message,
+          networkName: networkName,
+          onTap: onTap,
+        ),
+        const SizedBox(height: 10),
+      ],
     ),
   );
 }
diff --git a/lib/features/dapps/subfeatures/open_dapp/widgets/swtich_network_bottom_sheet.dart b/lib/features/dapps/subfeatures/open_dapp/widgets/swtich_network_bottom_sheet.dart
index 21a41767..8319eca1 100644
--- a/lib/features/dapps/subfeatures/open_dapp/widgets/swtich_network_bottom_sheet.dart
+++ b/lib/features/dapps/subfeatures/open_dapp/widgets/swtich_network_bottom_sheet.dart
@@ -1,10 +1,9 @@
+import 'package:moonchain_wallet/common/bottom_sheets/bottom_sheets.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 
-import 'transaction_info.dart';
-
 enum TransactionProcessType { confirm, send, sending, done }
 
 Future<bool?> showSwitchNetworkDialog(
@@ -15,70 +14,52 @@ Future<bool?> showSwitchNetworkDialog(
 }) {
   String translate(String text) => FlutterI18n.translate(context, text);
 
-  return showModalBottomSheet<bool>(
+  return showBaseBottomSheet<bool>(
     context: context,
-    useRootNavigator: true,
-    isScrollControlled: true,
-    useSafeArea: true,
-    backgroundColor: Colors.transparent,
-    builder: (BuildContext context) => Container(
-      padding: const EdgeInsets.only(
-          top: Sizes.spaceNormal, bottom: Sizes.space3XLarge),
-      decoration: BoxDecoration(
-        color: ColorsTheme.of(context).layerSheetBackground,
-        borderRadius: const BorderRadius.only(
-          topLeft: Radius.circular(20),
-          topRight: Radius.circular(20),
+    content: Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Padding(
+          padding: const EdgeInsetsDirectional.only(
+              start: Sizes.spaceNormal,
+              end: Sizes.spaceNormal,
+              bottom: Sizes.space2XLarge),
+          child: MxcAppBarEvenly.title(
+            titleText: translate('switch_to_network'),
+          ),
+        ),
+        Text(
+          translate('allow_this_site_notice')
+              .replaceFirst('{0}', "\"$fromNetwork\"")
+              .replaceFirst('{1}', "\"$toNetwork\""),
+          style: FontTheme.of(context, listen: false).body2.primary(),
+          textAlign: TextAlign.center,
+        ),
+        const SizedBox(
+          height: Sizes.spaceXLarge,
+        ),
+        MxcButton.secondary(
+          key: const ValueKey('cancelButton'),
+          title: translate('cancel'),
+          onTap: () => Navigator.of(context).pop(false),
+          size: MXCWalletButtonSize.xl,
+          edgeType: MXCWalletButtonEdgeType.hard,
         ),
-      ),
-      child: Padding(
-        padding: const EdgeInsetsDirectional.symmetric(
-          horizontal: Sizes.spaceXLarge,
+        const SizedBox(
+          height: Sizes.spaceXLarge,
         ),
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            Padding(
-              padding: const EdgeInsetsDirectional.only(
-                  start: Sizes.spaceNormal,
-                  end: Sizes.spaceNormal,
-                  bottom: Sizes.space2XLarge),
-              child: MxcAppBarEvenly.title(
-                titleText: translate('switch_to_network'),
-              ),
-            ),
-            Text(
-              translate('allow_this_site_notice')
-                  .replaceFirst('{0}', "\"$fromNetwork\"")
-                  .replaceFirst('{1}', "\"$toNetwork\""),
-              style: FontTheme.of(context).body2.primary(),
-              textAlign: TextAlign.center,
-            ),
-            const SizedBox(
-              height: Sizes.spaceXLarge,
-            ),
-            MxcButton.secondary(
-              key: const ValueKey('cancelButton'),
-              title: translate('cancel'),
-              onTap: () => Navigator.of(context).pop(false),
-              size: AxsButtonSize.xl,
-            ),
-            const SizedBox(
-              height: Sizes.spaceXLarge,
-            ),
-            MxcButton.primary(
-              key: const ValueKey('approveButton'),
-              title: translate('approve'),
-              onTap: () {
-                onTap();
-                Navigator.of(context).pop(true);
-              },
-              size: AxsButtonSize.xl,
-            ),
-            const SizedBox(height: Sizes.spaceNormal)
-          ],
+        MxcButton.primary(
+          key: const ValueKey('approveButton'),
+          title: translate('approve'),
+          onTap: () {
+            onTap();
+            Navigator.of(context).pop(true);
+          },
+          size: MXCWalletButtonSize.xl,
+          edgeType: MXCWalletButtonEdgeType.hard,
         ),
-      ),
+        const SizedBox(height: Sizes.spaceNormal),
+      ],
     ),
   );
 }
diff --git a/lib/features/dapps/subfeatures/open_dapp/widgets/transaction_dialog.dart b/lib/features/dapps/subfeatures/open_dapp/widgets/transaction_dialog.dart
index 7420731f..1d7b59e9 100644
--- a/lib/features/dapps/subfeatures/open_dapp/widgets/transaction_dialog.dart
+++ b/lib/features/dapps/subfeatures/open_dapp/widgets/transaction_dialog.dart
@@ -1,3 +1,4 @@
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 
@@ -12,47 +13,32 @@ Future<bool?> showTransactionDialog(BuildContext context,
     required String maxFee,
     VoidCallback? onTap,
     required String symbol}) {
-  return showModalBottomSheet<bool>(
+  return showBaseBottomSheet<bool>(
     context: context,
-    useRootNavigator: true,
-    isScrollControlled: true,
-    isDismissible: false,
-    useSafeArea: true,
-    backgroundColor: Colors.transparent,
-    builder: (BuildContext context) => Container(
-      padding: const EdgeInsets.only(left: 16, right: 16, top: 0, bottom: 44),
-      decoration: BoxDecoration(
-        color: ColorsTheme.of(context).screenBackground,
-        borderRadius: const BorderRadius.only(
-          topLeft: Radius.circular(20),
-          topRight: Radius.circular(20),
-        ),
-      ),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          MxcAppBarEvenly.title(
-            titleText: title ?? '',
-            action: Container(
-              alignment: Alignment.centerRight,
-              child: InkWell(
-                child: const Icon(Icons.close),
-                onTap: () => Navigator.of(context).pop(false),
-              ),
+    content: Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        MxcAppBarEvenly.title(
+          titleText: title ?? '',
+          action: Container(
+            alignment: Alignment.centerRight,
+            child: InkWell(
+              child: const Icon(Icons.close),
+              onTap: () => Navigator.of(context).pop(false),
             ),
           ),
-          TransactionInfo(
-            amount: amount,
-            from: from,
-            to: to,
-            estimatedFee: estimatedFee,
-            maxFee: maxFee,
-            onTap: onTap,
-            symbol: symbol,
-          ),
-          const SizedBox(height: 10),
-        ],
-      ),
+        ),
+        TransactionInfo(
+          amount: amount,
+          from: from,
+          to: to,
+          estimatedFee: estimatedFee,
+          maxFee: maxFee,
+          onTap: onTap,
+          symbol: symbol,
+        ),
+        const SizedBox(height: 10),
+      ],
     ),
   );
 }
diff --git a/lib/features/dapps/subfeatures/open_dapp/widgets/transaction_info.dart b/lib/features/dapps/subfeatures/open_dapp/widgets/transaction_info.dart
index 4f1e7313..6b24a148 100644
--- a/lib/features/dapps/subfeatures/open_dapp/widgets/transaction_info.dart
+++ b/lib/features/dapps/subfeatures/open_dapp/widgets/transaction_info.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -97,11 +97,11 @@ class TransactionInfo extends ConsumerWidget {
 
   Widget transactionButton(BuildContext context) {
     String titleText = 'confirm';
-    AxsButtonType type = AxsButtonType.primary;
+    MXCWalletButtonType type = MXCWalletButtonType.primary;
 
     return MxcButton.primary(
       key: const ValueKey('transactionButton'),
-      size: AxsButtonSize.xl,
+      size: MXCWalletButtonSize.xl,
       title: FlutterI18n.translate(context, titleText),
       type: type,
       onTap: () {
diff --git a/lib/features/dapps/subfeatures/open_dapp/widgets/typed_message_bottom_sheet.dart b/lib/features/dapps/subfeatures/open_dapp/widgets/typed_message_bottom_sheet.dart
index 06accd71..ed568af2 100644
--- a/lib/features/dapps/subfeatures/open_dapp/widgets/typed_message_bottom_sheet.dart
+++ b/lib/features/dapps/subfeatures/open_dapp/widgets/typed_message_bottom_sheet.dart
@@ -1,4 +1,5 @@
-import 'package:datadashwallet/features/dapps/subfeatures/open_dapp/widgets/typed_message_info.dart';
+import 'package:moonchain_wallet/common/bottom_sheets/bottom_sheets.dart';
+import 'package:moonchain_wallet/features/dapps/subfeatures/open_dapp/widgets/typed_message_info.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 
@@ -10,44 +11,29 @@ Future<bool?> showTypedMessageDialog(
   required Map<String, dynamic> message,
   VoidCallback? onTap,
 }) {
-  return showModalBottomSheet<bool>(
+  return showBaseBottomSheet<bool>(
     context: context,
-    useRootNavigator: true,
-    isScrollControlled: true,
-    isDismissible: false,
-    useSafeArea: true,
-    backgroundColor: Colors.transparent,
-    builder: (BuildContext context) => Container(
-      padding: const EdgeInsets.only(left: 16, right: 16, top: 0, bottom: 44),
-      decoration: BoxDecoration(
-        color: ColorsTheme.of(context).screenBackground,
-        borderRadius: const BorderRadius.only(
-          topLeft: Radius.circular(20),
-          topRight: Radius.circular(20),
-        ),
-      ),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          MxcAppBarEvenly.title(
-            titleText: title ?? '',
-            action: Container(
-              alignment: Alignment.centerRight,
-              child: InkWell(
-                child: const Icon(Icons.close),
-                onTap: () => Navigator.of(context).pop(false),
-              ),
+    content: Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        MxcAppBarEvenly.title(
+          titleText: title ?? '',
+          action: Container(
+            alignment: Alignment.centerRight,
+            child: InkWell(
+              child: const Icon(Icons.close),
+              onTap: () => Navigator.of(context).pop(false),
             ),
           ),
-          TypeMessageInfo(
-            message: message,
-            networkName: networkName,
-            primaryType: primaryType,
-            onTap: onTap,
-          ),
-          const SizedBox(height: 10),
-        ],
-      ),
+        ),
+        TypeMessageInfo(
+          message: message,
+          networkName: networkName,
+          primaryType: primaryType,
+          onTap: onTap,
+        ),
+        const SizedBox(height: 10),
+      ],
     ),
   );
 }
diff --git a/lib/features/dapps/subfeatures/open_dapp/widgets/typed_message_info.dart b/lib/features/dapps/subfeatures/open_dapp/widgets/typed_message_info.dart
index 6dd7162b..4a116d6c 100644
--- a/lib/features/dapps/subfeatures/open_dapp/widgets/typed_message_info.dart
+++ b/lib/features/dapps/subfeatures/open_dapp/widgets/typed_message_info.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -42,11 +42,11 @@ class TypeMessageInfo extends ConsumerWidget {
 
   Widget signButton(BuildContext context) {
     String titleText = 'sign';
-    AxsButtonType type = AxsButtonType.primary;
+    MXCWalletButtonType type = MXCWalletButtonType.primary;
 
     return MxcButton.primary(
       key: const ValueKey('signButton'),
-      size: AxsButtonSize.xl,
+      size: MXCWalletButtonSize.xl,
       title: FlutterI18n.translate(context, titleText),
       type: type,
       onTap: () {
diff --git a/lib/features/errors/network_unavailable/presentation/network_unavailable_wrapper.dart b/lib/features/errors/network_unavailable/presentation/network_unavailable_wrapper.dart
index 7a9f6594..c85076db 100644
--- a/lib/features/errors/network_unavailable/presentation/network_unavailable_wrapper.dart
+++ b/lib/features/errors/network_unavailable/presentation/network_unavailable_wrapper.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/common/hooks/hooks.dart';
+import 'package:moonchain_wallet/common/hooks/hooks.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'network_unavailable_wrapper_presenter.dart';
diff --git a/lib/features/errors/network_unavailable/presentation/network_unavailable_wrapper_presenter.dart b/lib/features/errors/network_unavailable/presentation/network_unavailable_wrapper_presenter.dart
index 876b2e77..61c82cf1 100644
--- a/lib/features/errors/network_unavailable/presentation/network_unavailable_wrapper_presenter.dart
+++ b/lib/features/errors/network_unavailable/presentation/network_unavailable_wrapper_presenter.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_ui/mxc_ui.dart';
@@ -48,6 +48,7 @@ class NetworkUnavailableWrapperPresenterPresenter
           }
         },
       ),
+      snackBarPosition: SnackBarPosition.top,
     );
   }
 }
diff --git a/lib/features/file_listener/file_listener_wrapper.dart b/lib/features/file_listener/file_listener_wrapper.dart
index 165cb24b..45b4b9f4 100644
--- a/lib/features/file_listener/file_listener_wrapper.dart
+++ b/lib/features/file_listener/file_listener_wrapper.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
diff --git a/lib/features/file_listener/file_listener_wrapper_presenter.dart b/lib/features/file_listener/file_listener_wrapper_presenter.dart
index 093eac1f..9aacc0e4 100644
--- a/lib/features/file_listener/file_listener_wrapper_presenter.dart
+++ b/lib/features/file_listener/file_listener_wrapper_presenter.dart
@@ -1,8 +1,8 @@
 import 'dart:io';
 
-import 'package:datadashwallet/app/app.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/security/security.dart';
+import 'package:moonchain_wallet/app/app.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/security/security.dart';
 import 'package:fl_shared_link/fl_shared_link.dart';
 import 'package:flutter/material.dart';
 
diff --git a/lib/features/portfolio/domain/portfolio_use_case.dart b/lib/features/portfolio/domain/portfolio_use_case.dart
index 6b251927..ce7b6362 100644
--- a/lib/features/portfolio/domain/portfolio_use_case.dart
+++ b/lib/features/portfolio/domain/portfolio_use_case.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'dart:math';
 
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'package:web3dart/web3dart.dart';
 
diff --git a/lib/features/portfolio/presentation/portfolio_page.dart b/lib/features/portfolio/presentation/portfolio_page.dart
index 478953b4..33a243c1 100644
--- a/lib/features/portfolio/presentation/portfolio_page.dart
+++ b/lib/features/portfolio/presentation/portfolio_page.dart
@@ -1,16 +1,17 @@
 import 'dart:ui';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/common/common.dart';
-import 'package:datadashwallet/features/dapps/dapps.dart';
-import 'package:datadashwallet/features/portfolio/subfeatures/nft/choose_nft/choose_nft_page.dart';
-import 'package:datadashwallet/features/portfolio/subfeatures/nft/nft_list/nft_list.dart';
-import 'package:datadashwallet/features/portfolio/subfeatures/tokens_balance_list/tokens_balance_list.dart';
-import 'package:datadashwallet/features/portfolio/subfeatures/transaction_history/transaction_history_page.dart';
-import 'package:datadashwallet/features/portfolio/subfeatures/token/send_token/choose_crypto/choose_crypto_page.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
+import 'package:moonchain_wallet/features/dapps/dapps.dart';
+import 'package:moonchain_wallet/features/dapps/subfeatures/open_dapp/open_dapp.dart';
+import 'package:moonchain_wallet/features/portfolio/subfeatures/nft/choose_nft/choose_nft_page.dart';
+import 'package:moonchain_wallet/features/portfolio/subfeatures/nft/nft_list/nft_list.dart';
+import 'package:moonchain_wallet/features/portfolio/subfeatures/tokens_balance_list/tokens_balance_list.dart';
+import 'package:moonchain_wallet/features/portfolio/subfeatures/transaction_history/transaction_history_page.dart';
+import 'package:moonchain_wallet/features/portfolio/subfeatures/token/send_token/choose_crypto/choose_crypto_page.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 
 import 'portfolio_page_presenter.dart';
@@ -22,11 +23,11 @@ class PortfolioPage extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final presenter = ref.read(portfolioContainer.actions);
     final state = ref.watch(portfolioContainer.state);
-    
+
     return MxcPage(
         presenter: presenter,
         resizeToAvoidBottomInset: true,
-        backgroundColor: ColorsTheme.of(context).screenBackground,
+        useGradientBackground: true,
         layout: LayoutType.column,
         useContentPadding: false,
         childrenPadding: const EdgeInsets.only(top: 25, right: 24, left: 24),
@@ -52,10 +53,9 @@ class PortfolioPage extends HookConsumerWidget {
                     child: BackdropFilter(
                       filter: ImageFilter.blur(sigmaX: 20.0, sigmaY: 20.0),
                       child: Container(
-                        // width: 100,
                         decoration: BoxDecoration(
                           border:
-                              Border.all(color: ColorsTheme.of(context).grey4),
+                              Border.all(color: ColorsTheme.of(context).white),
                           borderRadius:
                               const BorderRadius.all(Radius.circular(15)),
                           color:
@@ -71,11 +71,10 @@ class PortfolioPage extends HookConsumerWidget {
                       mainAxisAlignment: MainAxisAlignment.center,
                       crossAxisAlignment: CrossAxisAlignment.center,
                       children: [
-                        MxcCircleButton.icon(
+                        MXCRectangleButton.icon(
                           key: const Key('sendButton'),
                           icon: MxcIcons.send,
-                          iconFillColor: ColorsTheme.of(context)
-                              .iconButtonBackgroundActive,
+                          iconFillColor: Colors.white,
                           color: ColorsTheme.of(context).iconButtonInvertActive,
                           onTap: () => Navigator.of(context).push(route(
                               state.switchTokensOrNFTs
@@ -90,10 +89,9 @@ class PortfolioPage extends HookConsumerWidget {
                         const SizedBox(
                           width: 32,
                         ),
-                        MxcCircleButton.icon(
+                        MXCRectangleButton.icon(
                           key: const Key('receiveButton'),
-                          iconFillColor: ColorsTheme.of(context)
-                              .iconButtonBackgroundActive,
+                          iconFillColor: Colors.white,
                           color: ColorsTheme.of(context).iconButtonInvertActive,
                           icon: MxcIcons.receive,
                           onTap: () => presenter.showReceiveSheet(),
@@ -106,10 +104,9 @@ class PortfolioPage extends HookConsumerWidget {
                         const SizedBox(
                           width: 32,
                         ),
-                        MxcCircleButton.icon(
+                        MXCRectangleButton.icon(
                           key: const Key('historyButton'),
-                          iconFillColor: ColorsTheme.of(context)
-                              .iconButtonBackgroundActive,
+                          iconFillColor: Colors.white,
                           color: ColorsTheme.of(context).iconButtonInvertActive,
                           icon: MxcIcons.history,
                           onTap: () => Navigator.of(context)
@@ -153,6 +150,8 @@ class PortfolioPage extends HookConsumerWidget {
                     onTap: () => presenter.changeTokensOrNFTsTab(true),
                     title: FlutterI18n.translate(context, 'tokens'),
                     alignIconStart: true,
+                    mxcChipsEdgeType: MXCChipsEdgeType.hard,
+                    primaryColor: Colors.white,
                   ),
                   const SizedBox(
                     width: 10,
@@ -165,6 +164,8 @@ class PortfolioPage extends HookConsumerWidget {
                     onTap: () => presenter.changeTokensOrNFTsTab(false),
                     title: FlutterI18n.translate(context, 'nfts'),
                     alignIconStart: true,
+                    mxcChipsEdgeType: MXCChipsEdgeType.hard,
+                    primaryColor: Colors.white,
                   )
                 ],
               ),
diff --git a/lib/features/portfolio/presentation/portfolio_page_presenter.dart b/lib/features/portfolio/presentation/portfolio_page_presenter.dart
index fde06e35..6368edb7 100644
--- a/lib/features/portfolio/presentation/portfolio_page_presenter.dart
+++ b/lib/features/portfolio/presentation/portfolio_page_presenter.dart
@@ -1,6 +1,6 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/dapps/dapps.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/dapps/dapps.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
@@ -67,9 +67,13 @@ class PortfolioPresenter extends CompletePresenter<PortfolioState> {
   }
 
   getNfts() async {
-    final newNftList =
-        await _nftContractUseCase.getNftsByAddress(state.walletAddress!);
-    _nftUseCase.mergeNewList(newNftList);
+    final nftList = await _nftContractUseCase.getNftsByAddress(
+        state.walletAddress!, state.ipfsGateway!);
+    final domainsList = await _nftContractUseCase.getDomainsByAddress(
+        state.walletAddress!, state.ipfsGateway!);
+
+    nftList.addAll(domainsList);
+    _nftUseCase.mergeNewList(nftList);
   }
 
   void changeTokensOrNFTsTab(bool toggle) {
diff --git a/lib/features/portfolio/subfeatures/nft/add_nft/add_nft_page.dart b/lib/features/portfolio/subfeatures/nft/add_nft/add_nft_page.dart
index be61c7b9..d3b9a9f0 100644
--- a/lib/features/portfolio/subfeatures/nft/add_nft/add_nft_page.dart
+++ b/lib/features/portfolio/subfeatures/nft/add_nft/add_nft_page.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
diff --git a/lib/features/portfolio/subfeatures/nft/add_nft/add_nft_presenter.dart b/lib/features/portfolio/subfeatures/nft/add_nft/add_nft_presenter.dart
index d8fd4c22..9e33c9c8 100644
--- a/lib/features/portfolio/subfeatures/nft/add_nft/add_nft_presenter.dart
+++ b/lib/features/portfolio/subfeatures/nft/add_nft/add_nft_presenter.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 import 'add_nft_state.dart';
diff --git a/lib/features/portfolio/subfeatures/nft/choose_nft/choose_nft_page.dart b/lib/features/portfolio/subfeatures/nft/choose_nft/choose_nft_page.dart
index ff0cb64d..1bb23b23 100644
--- a/lib/features/portfolio/subfeatures/nft/choose_nft/choose_nft_page.dart
+++ b/lib/features/portfolio/subfeatures/nft/choose_nft/choose_nft_page.dart
@@ -1,9 +1,9 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/common/common.dart';
-import 'package:datadashwallet/features/dapps/dapps.dart';
-import 'package:datadashwallet/features/portfolio/subfeatures/nft/nft_list/nft_list.dart';
-import 'package:datadashwallet/features/portfolio/subfeatures/nft/send_nft/send_nft_page.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
+import 'package:moonchain_wallet/features/dapps/dapps.dart';
+import 'package:moonchain_wallet/features/portfolio/subfeatures/nft/nft_list/nft_list.dart';
+import 'package:moonchain_wallet/features/portfolio/subfeatures/nft/send_nft/send_nft_page.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
diff --git a/lib/features/portfolio/subfeatures/nft/choose_nft/choose_nft_presenter.dart b/lib/features/portfolio/subfeatures/nft/choose_nft/choose_nft_presenter.dart
index aded4756..0bc40dad 100644
--- a/lib/features/portfolio/subfeatures/nft/choose_nft/choose_nft_presenter.dart
+++ b/lib/features/portfolio/subfeatures/nft/choose_nft/choose_nft_presenter.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:flutter/material.dart';
 
 import 'choose_nft_state.dart';
@@ -12,7 +12,10 @@ class ChooseNftPresenter extends CompletePresenter<ChooseNftState> {
 
   late final _nftContractUseCase = ref.read(nftContractUseCaseProvider);
   late final _accountUserCase = ref.read(accountUseCaseProvider);
-  late final _nftsUseCase = ref.read(nftsUseCaseProvider);
+  late final _nftUseCase = ref.read(nftsUseCaseProvider);
+  late final _chainConfigurationUseCase =
+      ref.read(chainConfigurationUseCaseProvider);
+
   late final TextEditingController searchController = TextEditingController();
 
   @override
@@ -26,18 +29,28 @@ class ChooseNftPresenter extends CompletePresenter<ChooseNftState> {
       }
     });
 
-    listen(_nftsUseCase.nfts, (value) {
+    listen(_nftUseCase.nfts, (value) {
       notify(() {
         state.nfts = value;
         state.filterNfts = value;
       });
     });
+
+    listen(_chainConfigurationUseCase.selectedIpfsGateWay, (newIpfsGateWay) {
+      if (newIpfsGateWay != null) {
+        notify(() => state.ipfsGateway = newIpfsGateWay);
+      }
+    });
   }
 
   void loadPage() async {
-    final nfts =
-        await _nftContractUseCase.getNftsByAddress(state.account!.address);
-    _nftsUseCase.mergeNewList(nfts);
+    final nftList = await _nftContractUseCase.getNftsByAddress(
+        state.account!.address, state.ipfsGateway!);
+    final domainsList = await _nftContractUseCase.getDomainsByAddress(
+        state.account!.address, state.ipfsGateway!);
+
+    nftList.addAll(domainsList);
+    _nftUseCase.mergeNewList(nftList);
   }
 
   void fliterNfts(String value) {
diff --git a/lib/features/portfolio/subfeatures/nft/choose_nft/choose_nft_state.dart b/lib/features/portfolio/subfeatures/nft/choose_nft/choose_nft_state.dart
index 62349288..d57579d0 100644
--- a/lib/features/portfolio/subfeatures/nft/choose_nft/choose_nft_state.dart
+++ b/lib/features/portfolio/subfeatures/nft/choose_nft/choose_nft_state.dart
@@ -6,10 +6,13 @@ class ChooseNftState with EquatableMixin {
   List<Nft> filterNfts = [];
   Account? account;
 
+  String? ipfsGateway;
+
   @override
   List<Object?> get props => [
         nfts,
         filterNfts,
         account,
+        ipfsGateway,
       ];
 }
diff --git a/lib/features/portfolio/subfeatures/nft/domain/nfts_repository.dart b/lib/features/portfolio/subfeatures/nft/domain/nfts_repository.dart
index 0ae9952d..d22b4ae4 100644
--- a/lib/features/portfolio/subfeatures/nft/domain/nfts_repository.dart
+++ b/lib/features/portfolio/subfeatures/nft/domain/nfts_repository.dart
@@ -1,5 +1,5 @@
 import 'package:mxc_logic/mxc_logic.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 
 class NftsRepository extends ControlledCacheRepository {
   @override
diff --git a/lib/features/portfolio/subfeatures/nft/domain/nfts_use_case.dart b/lib/features/portfolio/subfeatures/nft/domain/nfts_use_case.dart
index c92a96fb..f99b83a7 100644
--- a/lib/features/portfolio/subfeatures/nft/domain/nfts_use_case.dart
+++ b/lib/features/portfolio/subfeatures/nft/domain/nfts_use_case.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'nfts_repository.dart';
 
@@ -33,31 +33,33 @@ class NftsUseCase extends ReactiveUseCase {
 
   void mergeNewList(List<Nft>? newNftList) {
     if (newNftList != null && newNftList.isNotEmpty) {
-      // updating cache by removing removed nfts
-      for (Nft nft in nfts.value) {
-        final foundItemIndex = newNftList.indexWhere((element) =>
-            (element.address == nft.address && element.tokenId == nft.tokenId));
-
-        // If cached nft does not exists in new list
-        if (foundItemIndex == -1) {
-          // nfts.value.removeAt(foundItemIndex);
-          _repository.removeItem(nft);
-          update(nfts, _repository.items);
-        }
-      }
-
-      // updating cache by adding new nfts
-      for (Nft nft in newNftList) {
-        final foundItemIndex = nfts.value.indexWhere((element) =>
-            (element.address == nft.address && element.tokenId == nft.tokenId));
-
-        // If cached nft does not exists in new list
-        if (foundItemIndex == -1) {
-          // nfts.value.add(nft);
-          _repository.addItem(nft);
-          update(nfts, _repository.items);
-        }
-      }
+      update(nfts, newNftList);
+
+      // // updating cache by removing removed nfts
+      // for (Nft nft in nfts.value) {
+      //   final foundItemIndex = newNftList.indexWhere((element) =>
+      //       (element.address == nft.address && element.tokenId == nft.tokenId));
+
+      //   // If cached nft does not exists in new list
+      //   if (foundItemIndex == -1) {
+      //     // nfts.value.removeAt(foundItemIndex);
+      //     _repository.removeItem(nft);
+      //     update(nfts, _repository.items);
+      //   }
+      // }
+
+      // // updating cache by adding new nfts
+      // for (Nft nft in newNftList) {
+      //   final foundItemIndex = nfts.value.indexWhere((element) =>
+      //       (element.address == nft.address && element.tokenId == nft.tokenId));
+
+      //   // If cached nft does not exists in new list
+      //   if (foundItemIndex == -1) {
+      //     // nfts.value.add(nft);
+      //     _repository.addItem(nft);
+      //     update(nfts, _repository.items);
+      //   }
+      // }
     }
   }
 }
diff --git a/lib/features/portfolio/subfeatures/nft/nft_list/nft_list.dart b/lib/features/portfolio/subfeatures/nft/nft_list/nft_list.dart
index 5e173e4b..5df5669d 100644
--- a/lib/features/portfolio/subfeatures/nft/nft_list/nft_list.dart
+++ b/lib/features/portfolio/subfeatures/nft/nft_list/nft_list.dart
@@ -1,9 +1,9 @@
 import 'dart:io';
 
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/dapps/dapps.dart';
-import 'package:datadashwallet/features/portfolio/presentation/portfolio_page_presenter.dart';
-import 'package:datadashwallet/features/portfolio/subfeatures/nft/nft_list/utils.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/dapps/dapps.dart';
+import 'package:moonchain_wallet/features/portfolio/presentation/portfolio_page_presenter.dart';
+import 'package:moonchain_wallet/features/portfolio/subfeatures/nft/nft_list/utils.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -30,11 +30,25 @@ class NFTList extends HookConsumerWidget {
         nfts.isEmpty
             ? Padding(
                 padding: const EdgeInsets.only(top: 100),
-                child: Text(
-                  translate('no_nfts_added_yet'),
-                  style: FontTheme.of(context).h6().copyWith(
-                        fontSize: 18,
-                      ),
+                child: Column(
+                  children: [
+                    Text(
+                      translate('no_nfts_added_yet'),
+                      style: FontTheme.of(context).body2.secondary(),
+                    ),
+                    const SizedBox(
+                      height: Sizes.spaceNormal,
+                    ),
+                    MxcChipButton(
+                      key: const Key('buyNFT'),
+                      title: FlutterI18n.translate(context, 'buy_x')
+                          .replaceFirst('{0}', 'NFT'),
+                      iconData: Icons.add_rounded,
+                      alignIconStart: true,
+                      onTap: () => presenter.getNfts(),
+                      backgroundColor: ColorsTheme.of(context).darkGray,
+                    ),
+                  ],
                 ),
               )
             : Column(
diff --git a/lib/features/portfolio/subfeatures/nft/nft_list/utils.dart b/lib/features/portfolio/subfeatures/nft/nft_list/utils.dart
index 77346d62..f9418279 100644
--- a/lib/features/portfolio/subfeatures/nft/nft_list/utils.dart
+++ b/lib/features/portfolio/subfeatures/nft/nft_list/utils.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/features/portfolio/subfeatures/nft/nft_list/widgets/nft_collection_expandable_item.dart';
+import 'package:moonchain_wallet/features/portfolio/subfeatures/nft/nft_list/widgets/nft_collection_expandable_item.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'package:collection/collection.dart';
 
diff --git a/lib/features/portfolio/subfeatures/nft/nft_list/widgets/nft_collection_expandable_item.dart b/lib/features/portfolio/subfeatures/nft/nft_list/widgets/nft_collection_expandable_item.dart
index ae7d4c02..0dde3b13 100644
--- a/lib/features/portfolio/subfeatures/nft/nft_list/widgets/nft_collection_expandable_item.dart
+++ b/lib/features/portfolio/subfeatures/nft/nft_list/widgets/nft_collection_expandable_item.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/features/portfolio/subfeatures/nft/nft_list/widgets/nft_item.dart';
+import 'package:moonchain_wallet/features/portfolio/subfeatures/nft/nft_list/widgets/nft_item.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'package:mxc_ui/mxc_ui.dart';
diff --git a/lib/features/portfolio/subfeatures/nft/nft_list/widgets/nft_item.dart b/lib/features/portfolio/subfeatures/nft/nft_list/widgets/nft_item.dart
index b5c9e48b..37f9f7ea 100644
--- a/lib/features/portfolio/subfeatures/nft/nft_list/widgets/nft_item.dart
+++ b/lib/features/portfolio/subfeatures/nft/nft_list/widgets/nft_item.dart
@@ -1,6 +1,103 @@
-import 'package:datadashwallet/features/portfolio/presentation/portfolio_page_presenter.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/features/portfolio/presentation/portfolio_page_presenter.dart';
+import 'package:moonchain_wallet/features/portfolio/presentation/portfolio_page_state.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:moonchain_wallet/main.dart';
+import 'package:mxc_logic/mxc_logic.dart';
+import 'package:mxc_ui/mxc_ui.dart';
+
+enum NFTItemType { domain, hexagon, networkImage, localImage, withoutImage }
+
+NFTItemType getNFTItemType(String? nftData) {
+  final pattern = RegExp(r'^\w+\.\w+$');
+  if (nftData == null) {
+    return NFTItemType.withoutImage;
+  } else if (nftData.startsWith('assets')) {
+    return NFTItemType.localImage;
+  } else if (pattern.hasMatch(nftData)) {
+    return NFTItemType.domain;
+  } else if (nftData.startsWith('#')) {
+    return NFTItemType.hexagon;
+  } else {
+    return NFTItemType.networkImage;
+  }
+}
+
+Widget getNFTWidget(PortfolioState state, BuildContext context,
+    NFTItemType nftItemType, String? nftData) {
+  Widget imageLoadingBuilder(
+      BuildContext context, Widget child, ImageChunkEvent? loadingProgress) {
+    if (loadingProgress == null) return child;
+    return Padding(
+      padding: const EdgeInsets.all(20),
+      child: CircularProgressIndicator(
+        value: loadingProgress.expectedTotalBytes != null
+            ? loadingProgress.cumulativeBytesLoaded /
+                loadingProgress.expectedTotalBytes!
+            : null,
+      ),
+    );
+  }
+
+  Widget imageErrorBuilder(
+          BuildContext context, Object error, StackTrace? stackTrace) =>
+      Text(
+        error.toString(),
+      );
+
+  switch (nftItemType) {
+    case NFTItemType.domain:
+      return Container(
+        decoration: BoxDecoration(
+            color: ColorsTheme.of(context).layerSheetBackground,
+            borderRadius: UIConfig.defaultBorderRadiusAll),
+        child: FittedBox(
+          fit: BoxFit.contain,
+          child: Center(
+            child: Text(
+              nftData!,
+              style: FontTheme.of(context).body1.textWhite(),
+            ),
+          ),
+        ),
+      );
+    case NFTItemType.hexagon:
+      return FittedBox(
+        fit: BoxFit.contain,
+        child: Icon(
+          Icons.hexagon,
+          color: MXCColors.hexStringToColor(nftData!),
+        ),
+      );
+
+    case NFTItemType.withoutImage:
+      return Container(
+        padding: const EdgeInsets.all(Sizes.space2XSmall),
+        color: ColorsTheme.of(context).darkGray,
+        child: Text(
+          appName,
+          style: FontTheme.of(context).logo(),
+        ),
+      );
+    case NFTItemType.localImage:
+      return Image(
+        image: AssetImage(
+          nftData!,
+        ),
+        fit: BoxFit.fill,
+        errorBuilder: imageErrorBuilder,
+        loadingBuilder: imageLoadingBuilder,
+      );
+    default:
+      return Image.network(
+        '${state.ipfsGateway}$nftData',
+        fit: BoxFit.fill,
+        errorBuilder: imageErrorBuilder,
+        loadingBuilder: imageLoadingBuilder,
+      );
+  }
+}
 
 class NFTItem extends HookConsumerWidget {
   const NFTItem({
@@ -9,39 +106,19 @@ class NFTItem extends HookConsumerWidget {
     this.size,
   });
 
-  final String imageUrl;
+  final String? imageUrl;
   final double? size;
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final state = ref.watch(portfolioContainer.state);
+    final nftItemType = getNFTItemType(imageUrl);
     return SizedBox(
       height: size ?? 105,
       width: size ?? 105,
       child: ClipRRect(
-        borderRadius: BorderRadius.circular(10),
-        child: state.ipfsGateway != null
-            ? Image.network(
-                '${state.ipfsGateway}$imageUrl',
-                fit: BoxFit.fill,
-                errorBuilder: (context, error, stackTrace) => Text(
-                  error.toString(),
-                ),
-                loadingBuilder: (context, child, loadingProgress) {
-                  if (loadingProgress == null) return child;
-                  return Padding(
-                    padding: const EdgeInsets.all(20),
-                    child: CircularProgressIndicator(
-                      value: loadingProgress.expectedTotalBytes != null
-                          ? loadingProgress.cumulativeBytesLoaded /
-                              loadingProgress.expectedTotalBytes!
-                          : null,
-                    ),
-                  );
-                },
-              )
-            : Container(),
-      ),
+          borderRadius: BorderRadius.circular(10),
+          child: getNFTWidget(state, context, nftItemType, imageUrl)),
     );
   }
 }
diff --git a/lib/features/portfolio/subfeatures/nft/send_nft/send_nft_page.dart b/lib/features/portfolio/subfeatures/nft/send_nft/send_nft_page.dart
index 1cb5f2b4..e71ffd16 100644
--- a/lib/features/portfolio/subfeatures/nft/send_nft/send_nft_page.dart
+++ b/lib/features/portfolio/subfeatures/nft/send_nft/send_nft_page.dart
@@ -1,7 +1,7 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/portfolio/subfeatures/nft/nft_list/widgets/nft_item.dart';
-import 'package:datadashwallet/features/settings/subfeatures/address_book/address_book.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/portfolio/subfeatures/nft/nft_list/widgets/nft_item.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/address_book/address_book.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
diff --git a/lib/features/portfolio/subfeatures/nft/send_nft/send_nft_presenter.dart b/lib/features/portfolio/subfeatures/nft/send_nft/send_nft_presenter.dart
index eef3dd41..341fa1d3 100644
--- a/lib/features/portfolio/subfeatures/nft/send_nft/send_nft_presenter.dart
+++ b/lib/features/portfolio/subfeatures/nft/send_nft/send_nft_presenter.dart
@@ -1,7 +1,7 @@
 import 'dart:typed_data';
 
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/portfolio/subfeatures/token/send_token/choose_crypto/choose_crypto_presenter.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/portfolio/subfeatures/token/send_token/choose_crypto/choose_crypto_presenter.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'package:mxc_ui/mxc_ui.dart';
diff --git a/lib/features/portfolio/subfeatures/nft/send_nft/widgets/transaction_dialog.dart b/lib/features/portfolio/subfeatures/nft/send_nft/widgets/transaction_dialog.dart
index 8945bc66..970c9cea 100644
--- a/lib/features/portfolio/subfeatures/nft/send_nft/widgets/transaction_dialog.dart
+++ b/lib/features/portfolio/subfeatures/nft/send_nft/widgets/transaction_dialog.dart
@@ -1,3 +1,4 @@
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'package:mxc_ui/mxc_ui.dart';
@@ -16,47 +17,33 @@ Future<bool?> showTransactionDialog(BuildContext context,
     TransactionProcessType? processType,
     VoidCallback? onTap,
     required String symbol}) {
-  return showModalBottomSheet<bool>(
+  return showBaseBottomSheet<bool>(
     context: context,
-    useRootNavigator: true,
-    isScrollControlled: true,
-    useSafeArea: true,
-    backgroundColor: Colors.transparent,
-    builder: (BuildContext context) => Container(
-      padding: const EdgeInsets.only(left: 16, right: 16, top: 0, bottom: 44),
-      decoration: BoxDecoration(
-        color: ColorsTheme.of(context).screenBackground,
-        borderRadius: const BorderRadius.only(
-          topLeft: Radius.circular(20),
-          topRight: Radius.circular(20),
-        ),
-      ),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          MxcAppBarEvenly.title(
-            titleText: title ?? '',
-            action: Container(
-              alignment: Alignment.centerRight,
-              child: InkWell(
-                child: const Icon(Icons.close),
-                onTap: () => Navigator.of(context).pop(false),
-              ),
+    content: Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        MxcAppBarEvenly.title(
+          titleText: title ?? '',
+          action: Container(
+            alignment: Alignment.centerRight,
+            child: InkWell(
+              child: const Icon(Icons.close),
+              onTap: () => Navigator.of(context).pop(false),
             ),
           ),
-          TransactionInfo(
-            nft: nft,
-            newtork: newtork,
-            from: from,
-            to: to,
-            estimatedFee: estimatedFee,
-            processType: processType,
-            onTap: onTap,
-            symbol: symbol,
-          ),
-          const SizedBox(height: 10),
-        ],
-      ),
+        ),
+        TransactionInfo(
+          nft: nft,
+          newtork: newtork,
+          from: from,
+          to: to,
+          estimatedFee: estimatedFee,
+          processType: processType,
+          onTap: onTap,
+          symbol: symbol,
+        ),
+        const SizedBox(height: 10),
+      ],
     ),
   );
 }
diff --git a/lib/features/portfolio/subfeatures/nft/send_nft/widgets/transaction_info.dart b/lib/features/portfolio/subfeatures/nft/send_nft/widgets/transaction_info.dart
index 4e0acb82..3c6a8c1c 100644
--- a/lib/features/portfolio/subfeatures/nft/send_nft/widgets/transaction_info.dart
+++ b/lib/features/portfolio/subfeatures/nft/send_nft/widgets/transaction_info.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/features/portfolio/subfeatures/nft/nft_list/widgets/nft_item.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/features/portfolio/subfeatures/nft/nft_list/widgets/nft_item.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_logic/mxc_logic.dart';
@@ -53,18 +53,18 @@ class TransactionInfo extends StatelessWidget {
 
   Widget transactionButton(BuildContext context) {
     String titleText = 'confirm';
-    AxsButtonType type = AxsButtonType.primary;
+    MXCWalletButtonType type = MXCWalletButtonType.primary;
 
     if (processType == TransactionProcessType.send) {
       titleText = 'send';
     } else if (processType == TransactionProcessType.done) {
       titleText = 'done';
-      type = AxsButtonType.pass;
+      type = MXCWalletButtonType.pass;
     }
 
     return MxcButton.primary(
       key: const ValueKey('transactionButton'),
-      size: AxsButtonSize.xl,
+      size: MXCWalletButtonSize.xl,
       title: FlutterI18n.translate(context, titleText),
       type: type,
       onTap: () {
diff --git a/lib/features/portfolio/subfeatures/token/add_token/add_token_page.dart b/lib/features/portfolio/subfeatures/token/add_token/add_token_page.dart
index c001356b..c961200d 100644
--- a/lib/features/portfolio/subfeatures/token/add_token/add_token_page.dart
+++ b/lib/features/portfolio/subfeatures/token/add_token/add_token_page.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
diff --git a/lib/features/portfolio/subfeatures/token/add_token/add_token_presenter.dart b/lib/features/portfolio/subfeatures/token/add_token/add_token_presenter.dart
index 6ca28784..7814dc4f 100644
--- a/lib/features/portfolio/subfeatures/token/add_token/add_token_presenter.dart
+++ b/lib/features/portfolio/subfeatures/token/add_token/add_token_presenter.dart
@@ -1,6 +1,6 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/common/common.dart';
-import 'package:datadashwallet/features/portfolio/subfeatures/token/add_token/domain/custom_tokens_use_case.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
+import 'package:moonchain_wallet/features/portfolio/subfeatures/token/add_token/domain/custom_tokens_use_case.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 
diff --git a/lib/features/portfolio/subfeatures/token/add_token/domain/custom_tokens_repository.dart b/lib/features/portfolio/subfeatures/token/add_token/domain/custom_tokens_repository.dart
index e9d21fad..968b399c 100644
--- a/lib/features/portfolio/subfeatures/token/add_token/domain/custom_tokens_repository.dart
+++ b/lib/features/portfolio/subfeatures/token/add_token/domain/custom_tokens_repository.dart
@@ -1,5 +1,5 @@
 import 'package:mxc_logic/mxc_logic.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 
 class CustomTokensRepository extends ControlledCacheRepository {
   @override
diff --git a/lib/features/portfolio/subfeatures/token/add_token/domain/custom_tokens_use_case.dart b/lib/features/portfolio/subfeatures/token/add_token/domain/custom_tokens_use_case.dart
index cb3d3460..8d5523c7 100644
--- a/lib/features/portfolio/subfeatures/token/add_token/domain/custom_tokens_use_case.dart
+++ b/lib/features/portfolio/subfeatures/token/add_token/domain/custom_tokens_use_case.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
 import 'custom_tokens_repository.dart';
diff --git a/lib/features/portfolio/subfeatures/token/send_token/choose_crypto/choose_crypto_page.dart b/lib/features/portfolio/subfeatures/token/send_token/choose_crypto/choose_crypto_page.dart
index bb6b760f..84ad7eb5 100644
--- a/lib/features/portfolio/subfeatures/token/send_token/choose_crypto/choose_crypto_page.dart
+++ b/lib/features/portfolio/subfeatures/token/send_token/choose_crypto/choose_crypto_page.dart
@@ -1,9 +1,9 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/common/common.dart';
-import 'package:datadashwallet/features/dapps/dapps.dart';
-import 'package:datadashwallet/features/portfolio/subfeatures/tokens_balance_list/utils.dart';
-import 'package:datadashwallet/features/portfolio/subfeatures/token/send_token/send_crypto/send_crypto_page.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
+import 'package:moonchain_wallet/features/dapps/dapps.dart';
+import 'package:moonchain_wallet/features/portfolio/subfeatures/tokens_balance_list/utils.dart';
+import 'package:moonchain_wallet/features/portfolio/subfeatures/token/send_token/send_crypto/send_crypto_page.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
@@ -36,6 +36,7 @@ class ChooseCryptoPage extends HookConsumerWidget {
       presenter: ref.watch(presenter),
       crossAxisAlignment: CrossAxisAlignment.start,
       layout: LayoutType.column,
+      useGradientBackground: true,
       appBar: AppNavBar(
         action: IconButton(
           key: const ValueKey('appsButton'),
@@ -69,7 +70,8 @@ class ChooseCryptoPage extends HookConsumerWidget {
                   MxcTextField.search(
                     key: const ValueKey('chooseTokenTextField'),
                     width: 150,
-                    backgroundColor: ColorsTheme.of(context).chipDefaultBg,
+                    backgroundColor:
+                        ColorsTheme.of(context).layerSheetBackground,
                     prefix: const Icon(Icons.search_rounded),
                     hint: translate('find_your_x')
                         .replaceFirst('{0}', translate('token').toLowerCase()),
diff --git a/lib/features/portfolio/subfeatures/token/send_token/choose_crypto/choose_crypto_presenter.dart b/lib/features/portfolio/subfeatures/token/send_token/choose_crypto/choose_crypto_presenter.dart
index 79bd41e0..6a5fe105 100644
--- a/lib/features/portfolio/subfeatures/token/send_token/choose_crypto/choose_crypto_presenter.dart
+++ b/lib/features/portfolio/subfeatures/token/send_token/choose_crypto/choose_crypto_presenter.dart
@@ -1,5 +1,5 @@
 import 'package:mxc_logic/mxc_logic.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:flutter/material.dart';
 
 import 'choose_crypto_state.dart';
diff --git a/lib/features/portfolio/subfeatures/token/send_token/send_crypto/send_crypto_page.dart b/lib/features/portfolio/subfeatures/token/send_token/send_crypto/send_crypto_page.dart
index 7f13fb4b..60678535 100644
--- a/lib/features/portfolio/subfeatures/token/send_token/send_crypto/send_crypto_page.dart
+++ b/lib/features/portfolio/subfeatures/token/send_token/send_crypto/send_crypto_page.dart
@@ -1,6 +1,6 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/subfeatures/address_book/address_book.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/address_book/address_book.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -48,6 +48,7 @@ class SendCryptoPage extends HookConsumerWidget {
         child: MxcButton.primary(
           key: const ValueKey('nextButton'),
           title: FlutterI18n.translate(context, 'next'),
+          size: MXCWalletButtonSize.xxl,
           onTap: ref.watch(state).valid
               ? () {
                   FocusManager.instance.primaryFocus?.unfocus();
@@ -163,6 +164,7 @@ class SendCryptoPage extends HookConsumerWidget {
                               buttonState: ref.watch(state).discount == item
                                   ? ChipButtonStates.activeState
                                   : ChipButtonStates.inactiveState,
+                              mxcChipsEdgeType: MXCChipsEdgeType.hard,
                             ),
                           ))
                       .toList()),
diff --git a/lib/features/portfolio/subfeatures/token/send_token/send_crypto/send_crypto_presenter.dart b/lib/features/portfolio/subfeatures/token/send_token/send_crypto/send_crypto_presenter.dart
index f13829df..a0ba4542 100644
--- a/lib/features/portfolio/subfeatures/token/send_token/send_crypto/send_crypto_presenter.dart
+++ b/lib/features/portfolio/subfeatures/token/send_token/send_crypto/send_crypto_presenter.dart
@@ -1,10 +1,10 @@
 import 'dart:typed_data';
 
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/common/utils/utils.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/common/common.dart';
-import 'package:datadashwallet/features/common/app_nav_bar/app_nav_bar_presenter.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/common/utils/utils.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
+import 'package:moonchain_wallet/features/common/app_nav_bar/app_nav_bar_presenter.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_logic/mxc_logic.dart';
diff --git a/lib/features/portfolio/subfeatures/token/send_token/send_crypto/widgets/transaction_dialog.dart b/lib/features/portfolio/subfeatures/token/send_token/send_crypto/widgets/transaction_dialog.dart
index d31abe7b..bd83463a 100644
--- a/lib/features/portfolio/subfeatures/token/send_token/send_crypto/widgets/transaction_dialog.dart
+++ b/lib/features/portfolio/subfeatures/token/send_token/send_crypto/widgets/transaction_dialog.dart
@@ -1,3 +1,4 @@
+import 'package:moonchain_wallet/common/bottom_sheets/bottom_sheets.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'package:mxc_ui/mxc_ui.dart';
@@ -20,34 +21,20 @@ Future<bool?> showTransactionDialog(
   TransactionProcessType? processType,
   required Function(TransactionProcessType) onTap,
 }) {
-  return showModalBottomSheet<bool>(
+  return showBaseBottomSheet<bool>(
     context: context,
-    useRootNavigator: true,
-    isScrollControlled: true,
-    useSafeArea: true,
-    backgroundColor: Colors.transparent,
-    builder: (BuildContext context) => Container(
-      padding: const EdgeInsets.only(left: 16, right: 16, top: 0, bottom: 44),
-      decoration: BoxDecoration(
-        color: ColorsTheme.of(context).screenBackground,
-        borderRadius: const BorderRadius.only(
-          topLeft: Radius.circular(20),
-          topRight: Radius.circular(20),
-        ),
-      ),
-      child: TransactionInfo(
-        amount: amount,
-        balance: balance,
-        token: token,
-        network: network,
-        networkSymbol: networkSymbol,
-        from: from,
-        to: to,
-        estimatedFee: estimatedFee,
-        maxFee: maxFee,
-        processType: processType,
-        onTap: onTap,
-      ),
+    content: TransactionInfo(
+      amount: amount,
+      balance: balance,
+      token: token,
+      network: network,
+      networkSymbol: networkSymbol,
+      from: from,
+      to: to,
+      estimatedFee: estimatedFee,
+      maxFee: maxFee,
+      processType: processType,
+      onTap: onTap,
     ),
   );
 }
diff --git a/lib/features/portfolio/subfeatures/token/send_token/send_crypto/widgets/transaction_info.dart b/lib/features/portfolio/subfeatures/token/send_token/send_crypto/widgets/transaction_info.dart
index a258c90a..c282270a 100644
--- a/lib/features/portfolio/subfeatures/token/send_token/send_crypto/widgets/transaction_info.dart
+++ b/lib/features/portfolio/subfeatures/token/send_token/send_crypto/widgets/transaction_info.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_logic/mxc_logic.dart';
@@ -52,7 +52,7 @@ class _TransactionInfoState extends State<TransactionInfo> {
           action: Container(
             alignment: Alignment.centerRight,
             child: InkWell(
-              child: const Icon(Icons.close),
+              child: const Icon(Icons.close, size: 30),
               onTap: () => Navigator.of(context).pop(false),
             ),
           ),
@@ -115,7 +115,7 @@ class _TransactionInfoState extends State<TransactionInfo> {
 
   Widget transactionButton(BuildContext context) {
     String titleText = 'confirm';
-    AxsButtonType type = AxsButtonType.primary;
+    MXCWalletButtonType type = MXCWalletButtonType.primary;
 
     switch (processType) {
       case TransactionProcessType.confirm:
@@ -129,7 +129,7 @@ class _TransactionInfoState extends State<TransactionInfo> {
         break;
       default:
         titleText = 'done';
-        type = AxsButtonType.pass;
+        type = MXCWalletButtonType.pass;
         break;
     }
 
@@ -142,7 +142,7 @@ class _TransactionInfoState extends State<TransactionInfo> {
 
     return MxcButton.primary(
       key: const ValueKey('transactionButton'),
-      size: AxsButtonSize.xl,
+      size: MXCWalletButtonSize.xl,
       title: FlutterI18n.translate(context, titleText),
       type: type,
       onTap: () async {
@@ -166,7 +166,7 @@ class _TransactionInfoState extends State<TransactionInfo> {
       children: [
         Text(
           FlutterI18n.translate(context, 'sending'),
-          style: FontTheme.of(context).subtitle1.secondary(),
+          style: FontTheme.of(context, listen: false).subtitle1.secondary(),
         ),
         const SizedBox(width: 4),
         Row(
@@ -176,12 +176,12 @@ class _TransactionInfoState extends State<TransactionInfo> {
               MXCFormatter.formatNumberForUI(
                 widget.amount,
               ),
-              style: FontTheme.of(context).h5(),
+              style: FontTheme.of(context, listen: false).h5(),
             ),
             const SizedBox(width: 4),
             Text(
               widget.token.symbol ?? '--',
-              style: FontTheme.of(context).h5.secondary(),
+              style: FontTheme.of(context, listen: false).h5.secondary(),
             ),
             const SizedBox(height: 4),
           ],
diff --git a/lib/features/portfolio/subfeatures/tokens_balance_list/tokens_balance_list.dart b/lib/features/portfolio/subfeatures/tokens_balance_list/tokens_balance_list.dart
index 439e5ced..5f943750 100644
--- a/lib/features/portfolio/subfeatures/tokens_balance_list/tokens_balance_list.dart
+++ b/lib/features/portfolio/subfeatures/tokens_balance_list/tokens_balance_list.dart
@@ -1,7 +1,7 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/portfolio/portfolio.dart';
-import 'package:datadashwallet/features/portfolio/subfeatures/token/add_token/add_token_page.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/portfolio/portfolio.dart';
+import 'package:moonchain_wallet/features/portfolio/subfeatures/token/add_token/add_token_page.dart';
 import '../token/send_token/send_crypto/send_crypto_page.dart';
 import './utils.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/features/portfolio/subfeatures/tokens_balance_list/utils.dart b/lib/features/portfolio/subfeatures/tokens_balance_list/utils.dart
index 0e4d9725..a4b1b653 100644
--- a/lib/features/portfolio/subfeatures/tokens_balance_list/utils.dart
+++ b/lib/features/portfolio/subfeatures/tokens_balance_list/utils.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
 import 'widgets/token_balance_item.dart';
diff --git a/lib/features/portfolio/subfeatures/tokens_balance_list/widgets/token_balance_item.dart b/lib/features/portfolio/subfeatures/tokens_balance_list/widgets/token_balance_item.dart
index bb435c76..48f8284b 100644
--- a/lib/features/portfolio/subfeatures/tokens_balance_list/widgets/token_balance_item.dart
+++ b/lib/features/portfolio/subfeatures/tokens_balance_list/widgets/token_balance_item.dart
@@ -1,6 +1,6 @@
-import 'package:datadashwallet/core/src/providers/providers_use_cases.dart';
-import 'package:datadashwallet/features/common/common.dart';
-import 'package:datadashwallet/features/wallet/wallet.dart';
+import 'package:moonchain_wallet/core/src/providers/providers_use_cases.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
+import 'package:moonchain_wallet/features/wallet/wallet.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
diff --git a/lib/features/portfolio/subfeatures/transaction_history/transaction_history_page.dart b/lib/features/portfolio/subfeatures/transaction_history/transaction_history_page.dart
index 89a46932..e5c29f1b 100644
--- a/lib/features/portfolio/subfeatures/transaction_history/transaction_history_page.dart
+++ b/lib/features/portfolio/subfeatures/transaction_history/transaction_history_page.dart
@@ -1,7 +1,7 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/common/common.dart';
-import 'package:datadashwallet/features/dapps/dapps.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
+import 'package:moonchain_wallet/features/dapps/dapps.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -28,6 +28,7 @@ class TransactionHistoryPage extends HookConsumerWidget {
     return MxcPage(
       presenter: ref.watch(presenter),
       onRefresh: () => ref.read(presenter).loadPage(),
+      useGradientBackground: true,
       crossAxisAlignment: CrossAxisAlignment.start,
       appBar: AppNavBar(
         action: IconButton(
diff --git a/lib/features/portfolio/subfeatures/transaction_history/transaction_history_presenter.dart b/lib/features/portfolio/subfeatures/transaction_history/transaction_history_presenter.dart
index b2b48270..f7e8452b 100644
--- a/lib/features/portfolio/subfeatures/transaction_history/transaction_history_presenter.dart
+++ b/lib/features/portfolio/subfeatures/transaction_history/transaction_history_presenter.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
 import 'transaction_history_state.dart';
diff --git a/lib/features/portfolio/subfeatures/transaction_history/transaction_history_state.dart b/lib/features/portfolio/subfeatures/transaction_history/transaction_history_state.dart
index a0001216..5e0922df 100644
--- a/lib/features/portfolio/subfeatures/transaction_history/transaction_history_state.dart
+++ b/lib/features/portfolio/subfeatures/transaction_history/transaction_history_state.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:equatable/equatable.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
diff --git a/lib/features/portfolio/subfeatures/transaction_history/widgets/filter_and_sort_dialog.dart b/lib/features/portfolio/subfeatures/transaction_history/widgets/filter_and_sort_dialog.dart
index 24d92b2b..ad43802c 100644
--- a/lib/features/portfolio/subfeatures/transaction_history/widgets/filter_and_sort_dialog.dart
+++ b/lib/features/portfolio/subfeatures/transaction_history/widgets/filter_and_sort_dialog.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_ui/mxc_ui.dart';
@@ -18,44 +18,30 @@ Future<bool?> showFilterAndSortDialog(
           SortType dateSort, SortType amountSort)?
       onTap,
 }) {
-  return showModalBottomSheet<bool>(
+  return showBaseBottomSheet<bool>(
     context: context,
-    useRootNavigator: true,
-    isScrollControlled: true,
-    useSafeArea: true,
-    backgroundColor: Colors.transparent,
-    builder: (BuildContext context) => Container(
-      padding: const EdgeInsets.only(left: 16, right: 16, top: 0, bottom: 44),
-      decoration: BoxDecoration(
-        color: ColorsTheme.of(context).screenBackground,
-        borderRadius: const BorderRadius.only(
-          topLeft: Radius.circular(20),
-          topRight: Radius.circular(20),
-        ),
-      ),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          MxcAppBarEvenly.title(
-            titleText: FlutterI18n.translate(context, 'filter_&_sort'),
-            action: Container(
-              alignment: Alignment.centerRight,
-              child: InkWell(
-                child: const Icon(Icons.close),
-                onTap: () => Navigator.of(context).pop(false),
-              ),
+    content: Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        MxcAppBarEvenly.title(
+          titleText: FlutterI18n.translate(context, 'filter_&_sort'),
+          action: Container(
+            alignment: Alignment.centerRight,
+            child: InkWell(
+              child: const Icon(Icons.close),
+              onTap: () => Navigator.of(context).pop(false),
             ),
           ),
-          FilterAndSortItems(
-            transactionType: transactionType,
-            sortOption: sortOption,
-            dateSort: dateSort,
-            amountSort: amountSort,
-            onTap: onTap,
-          ),
-          const SizedBox(height: 10),
-        ],
-      ),
+        ),
+        FilterAndSortItems(
+          transactionType: transactionType,
+          sortOption: sortOption,
+          dateSort: dateSort,
+          amountSort: amountSort,
+          onTap: onTap,
+        ),
+        const SizedBox(height: 10),
+      ],
     ),
   );
 }
diff --git a/lib/features/portfolio/subfeatures/transaction_history/widgets/filter_and_sort_items.dart b/lib/features/portfolio/subfeatures/transaction_history/widgets/filter_and_sort_items.dart
index 8bb524d7..ca4e396e 100644
--- a/lib/features/portfolio/subfeatures/transaction_history/widgets/filter_and_sort_items.dart
+++ b/lib/features/portfolio/subfeatures/transaction_history/widgets/filter_and_sort_items.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_ui/mxc_ui.dart';
@@ -96,7 +96,7 @@ class _FilterAndSortItemsState extends State<FilterAndSortItems> {
         const SizedBox(height: 8),
         MxcButton.primary(
             key: const ValueKey('transactionButton'),
-            size: AxsButtonSize.xl,
+            size: MXCWalletButtonSize.xl,
             title: FlutterI18n.translate(context, 'done'),
             onTap: () {
               Navigator.of(context).pop();
diff --git a/lib/features/security/biometric_name.dart b/lib/features/security/biometric_name.dart
index f8ef83d7..de9ded13 100644
--- a/lib/features/security/biometric_name.dart
+++ b/lib/features/security/biometric_name.dart
@@ -3,7 +3,7 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:local_auth/local_auth.dart';
-import 'package:datadashwallet/common/biometric.dart';
+import 'package:moonchain_wallet/common/biometric.dart';
 
 String biometricSystemName(BuildContext context) {
   if (Platform.isAndroid) {
diff --git a/lib/features/security/domain/passcode_repository.dart b/lib/features/security/domain/passcode_repository.dart
index d024f7e5..bddb9c30 100644
--- a/lib/features/security/domain/passcode_repository.dart
+++ b/lib/features/security/domain/passcode_repository.dart
@@ -1,5 +1,5 @@
 import 'package:mxc_logic/mxc_logic.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 
 class PasscodeRepository extends GlobalCacheRepository {
   @override
diff --git a/lib/features/security/domain/passcode_use_case.dart b/lib/features/security/domain/passcode_use_case.dart
index c940e199..1da1b05e 100644
--- a/lib/features/security/domain/passcode_use_case.dart
+++ b/lib/features/security/domain/passcode_use_case.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 
 import 'passcode_repository.dart';
 
diff --git a/lib/features/security/presentation/passcode.dart b/lib/features/security/presentation/passcode.dart
index a791cc0d..eca64363 100644
--- a/lib/features/security/presentation/passcode.dart
+++ b/lib/features/security/presentation/passcode.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:flutter/material.dart';
 
 import 'passcode_set/passcode_set_page/passcode_set_page.dart';
diff --git a/lib/features/security/presentation/passcode_authenticate/passcode_authenticate_user_page.dart b/lib/features/security/presentation/passcode_authenticate/passcode_authenticate_user_page.dart
index d8a3ce30..28fd352e 100644
--- a/lib/features/security/presentation/passcode_authenticate/passcode_authenticate_user_page.dart
+++ b/lib/features/security/presentation/passcode_authenticate/passcode_authenticate_user_page.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/features/security/security.dart';
+import 'package:moonchain_wallet/features/security/security.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
diff --git a/lib/features/security/presentation/passcode_authenticate/passcode_authenticate_user_presenter.dart b/lib/features/security/presentation/passcode_authenticate/passcode_authenticate_user_presenter.dart
index 24fddf5e..0d6dd806 100644
--- a/lib/features/security/presentation/passcode_authenticate/passcode_authenticate_user_presenter.dart
+++ b/lib/features/security/presentation/passcode_authenticate/passcode_authenticate_user_presenter.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/security/security.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/security/security.dart';
 import 'passcode_authenticate_user_state.dart';
 
 final passcodeAuthenticateUserContainer = PresenterContainer<
diff --git a/lib/features/security/presentation/passcode_authenticate/passcode_authenticate_user_state.dart b/lib/features/security/presentation/passcode_authenticate/passcode_authenticate_user_state.dart
index e1c5a093..f9d173ed 100644
--- a/lib/features/security/presentation/passcode_authenticate/passcode_authenticate_user_state.dart
+++ b/lib/features/security/presentation/passcode_authenticate/passcode_authenticate_user_state.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/features/security/security.dart';
+import 'package:moonchain_wallet/features/security/security.dart';
 
 class PasscodeAuthenticateUserState extends PasscodeBasePageState {
   int wrongInputCounter = 0;
diff --git a/lib/features/security/presentation/passcode_base/passcode_base_page.dart b/lib/features/security/presentation/passcode_base/passcode_base_page.dart
index 13242570..6e3d4c08 100644
--- a/lib/features/security/presentation/passcode_base/passcode_base_page.dart
+++ b/lib/features/security/presentation/passcode_base/passcode_base_page.dart
@@ -1,14 +1,14 @@
 import 'dart:developer';
 
-import 'package:datadashwallet/app/app.dart';
-import 'package:datadashwallet/features/security/presentation/passcode_base/widget/numbers_row_widget.dart';
-import 'package:datadashwallet/features/security/presentation/passcode_require/widgets/circle_animation.dart';
+import 'package:moonchain_wallet/app/app.dart';
+import 'package:moonchain_wallet/features/security/presentation/passcode_base/widget/numbers_row_widget.dart';
+import 'package:moonchain_wallet/features/security/presentation/passcode_require/widgets/circle_animation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:mxc_ui/mxc_ui.dart';
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 
 import 'passcode_base_page_presenter.dart';
 import 'passcode_base_page_state.dart';
diff --git a/lib/features/security/presentation/passcode_base/passcode_base_page_presenter.dart b/lib/features/security/presentation/passcode_base/passcode_base_page_presenter.dart
index 9143fb0f..b9da52d2 100644
--- a/lib/features/security/presentation/passcode_base/passcode_base_page_presenter.dart
+++ b/lib/features/security/presentation/passcode_base/passcode_base_page_presenter.dart
@@ -1,7 +1,7 @@
-import 'package:datadashwallet/features/security/security.dart';
+import 'package:moonchain_wallet/features/security/security.dart';
 import 'package:flutter/material.dart';
-import 'package:datadashwallet/common/biometric.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/common/biometric.dart';
+import 'package:moonchain_wallet/core/core.dart';
 
 import 'passcode_base_page_state.dart';
 
diff --git a/lib/features/security/presentation/passcode_base/widget/numbers_row_widget.dart b/lib/features/security/presentation/passcode_base/widget/numbers_row_widget.dart
index 0969f68b..94322593 100644
--- a/lib/features/security/presentation/passcode_base/widget/numbers_row_widget.dart
+++ b/lib/features/security/presentation/passcode_base/widget/numbers_row_widget.dart
@@ -1,6 +1,6 @@
 import 'dart:math';
 
-import 'package:datadashwallet/common/color_filter.dart';
+import 'package:moonchain_wallet/common/color_filter.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
diff --git a/lib/features/security/presentation/passcode_change/passcode_change_confirm_page/passcode_change_confirm_page.dart b/lib/features/security/presentation/passcode_change/passcode_change_confirm_page/passcode_change_confirm_page.dart
index 6b91051f..0b07e46b 100644
--- a/lib/features/security/presentation/passcode_change/passcode_change_confirm_page/passcode_change_confirm_page.dart
+++ b/lib/features/security/presentation/passcode_change/passcode_change_confirm_page/passcode_change_confirm_page.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/features/security/security.dart';
+import 'package:moonchain_wallet/features/security/security.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
diff --git a/lib/features/security/presentation/passcode_change/passcode_change_confirm_page/passcode_change_confirm_page_presenter.dart b/lib/features/security/presentation/passcode_change/passcode_change_confirm_page/passcode_change_confirm_page_presenter.dart
index 8aa2df0e..9ee182ce 100644
--- a/lib/features/security/presentation/passcode_change/passcode_change_confirm_page/passcode_change_confirm_page_presenter.dart
+++ b/lib/features/security/presentation/passcode_change/passcode_change_confirm_page/passcode_change_confirm_page_presenter.dart
@@ -1,6 +1,6 @@
 import 'package:collection/collection.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/security/security.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/security/security.dart';
 
 final passcodeChangeConfirmPageContainer = PresenterContainerWithParameter<
     PasscodeChangeConfirmPagePresenter,
diff --git a/lib/features/security/presentation/passcode_change/passcode_change_enter_current_page/passcode_change_enter_current_page.dart b/lib/features/security/presentation/passcode_change/passcode_change_enter_current_page/passcode_change_enter_current_page.dart
index e2598bc8..e92ab54b 100644
--- a/lib/features/security/presentation/passcode_change/passcode_change_enter_current_page/passcode_change_enter_current_page.dart
+++ b/lib/features/security/presentation/passcode_change/passcode_change_enter_current_page/passcode_change_enter_current_page.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/features/security/security.dart';
+import 'package:moonchain_wallet/features/security/security.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
diff --git a/lib/features/security/presentation/passcode_change/passcode_change_enter_current_page/passcode_change_enter_current_page_presenter.dart b/lib/features/security/presentation/passcode_change/passcode_change_enter_current_page/passcode_change_enter_current_page_presenter.dart
index b703ff5b..4d669eb7 100644
--- a/lib/features/security/presentation/passcode_change/passcode_change_enter_current_page/passcode_change_enter_current_page_presenter.dart
+++ b/lib/features/security/presentation/passcode_change/passcode_change_enter_current_page/passcode_change_enter_current_page_presenter.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/security/security.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/security/security.dart';
 
 import 'passcode_change_enter_current_page_state.dart';
 
diff --git a/lib/features/security/presentation/passcode_change/passcode_change_enter_current_page/passcode_change_enter_current_page_state.dart b/lib/features/security/presentation/passcode_change/passcode_change_enter_current_page/passcode_change_enter_current_page_state.dart
index 339c3df1..ceee050b 100644
--- a/lib/features/security/presentation/passcode_change/passcode_change_enter_current_page/passcode_change_enter_current_page_state.dart
+++ b/lib/features/security/presentation/passcode_change/passcode_change_enter_current_page/passcode_change_enter_current_page_state.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/features/security/security.dart';
+import 'package:moonchain_wallet/features/security/security.dart';
 
 class PasscodeChangeEnterCurrentPageState extends PasscodeBasePageState {
   int wrongInputCounter = 0;
diff --git a/lib/features/security/presentation/passcode_change/passcode_change_enter_new_page/passcode_change_enter_new_page.dart b/lib/features/security/presentation/passcode_change/passcode_change_enter_new_page/passcode_change_enter_new_page.dart
index 326e896a..017fca16 100644
--- a/lib/features/security/presentation/passcode_change/passcode_change_enter_new_page/passcode_change_enter_new_page.dart
+++ b/lib/features/security/presentation/passcode_change/passcode_change_enter_new_page/passcode_change_enter_new_page.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/features/security/security.dart';
+import 'package:moonchain_wallet/features/security/security.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
diff --git a/lib/features/security/presentation/passcode_change/passcode_change_enter_new_page/passcode_change_enter_new_page_presenter.dart b/lib/features/security/presentation/passcode_change/passcode_change_enter_new_page/passcode_change_enter_new_page_presenter.dart
index c7d15f42..c59e9782 100644
--- a/lib/features/security/presentation/passcode_change/passcode_change_enter_new_page/passcode_change_enter_new_page_presenter.dart
+++ b/lib/features/security/presentation/passcode_change/passcode_change_enter_new_page/passcode_change_enter_new_page_presenter.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/security/security.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/security/security.dart';
 
 final passcodeChangeEnterNewPageContainer = PresenterContainer<
     PasscodeChangeEnterNewPagePresenter,
diff --git a/lib/features/security/presentation/passcode_require/passcode_require_page.dart b/lib/features/security/presentation/passcode_require/passcode_require_page.dart
index 346c3ff8..53eae83b 100644
--- a/lib/features/security/presentation/passcode_require/passcode_require_page.dart
+++ b/lib/features/security/presentation/passcode_require/passcode_require_page.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/features/security/security.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/features/security/security.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -22,7 +22,7 @@ class PasscodeRequirePage extends PasscodeBasePage {
 
   @override
   String title(BuildContext context, WidgetRef ref) =>
-      FlutterI18n.translate(context, 'unlock_axs_wallet');
+      FlutterI18n.translate(context, 'unlock_moonchain_wallet');
 
   @override
   String hint(BuildContext context, WidgetRef ref) =>
@@ -91,8 +91,9 @@ class PasscodeRequirePage extends PasscodeBasePage {
             child: MxcButton.secondaryWhite(
               key: const ValueKey('forgotPasscodeButton'),
               title: FlutterI18n.translate(context, 'forgot_passcode'),
-              size: AxsButtonSize.xl,
+              size: MXCWalletButtonSize.xl,
               onTap: () => showResetPasscodeDialog(context, ref),
+              edgeType: UIConfig.securityScreensButtonsEdgeType,
             ),
           ),
         const Spacer(),
diff --git a/lib/features/security/presentation/passcode_require/passcode_require_presenter.dart b/lib/features/security/presentation/passcode_require/passcode_require_presenter.dart
index dff24243..a37bc3f1 100644
--- a/lib/features/security/presentation/passcode_require/passcode_require_presenter.dart
+++ b/lib/features/security/presentation/passcode_require/passcode_require_presenter.dart
@@ -1,6 +1,6 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/security/security.dart';
-import 'package:datadashwallet/features/splash/splash.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/security/security.dart';
+import 'package:moonchain_wallet/features/splash/splash.dart';
 import 'package:vibration/vibration.dart';
 
 import 'passcode_require_state.dart';
diff --git a/lib/features/security/presentation/passcode_require/passcode_require_state.dart b/lib/features/security/presentation/passcode_require/passcode_require_state.dart
index 717fd66f..520ac952 100644
--- a/lib/features/security/presentation/passcode_require/passcode_require_state.dart
+++ b/lib/features/security/presentation/passcode_require/passcode_require_state.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/features/security/security.dart';
+import 'package:moonchain_wallet/features/security/security.dart';
 
 class PasscodeRequiredPageState extends PasscodeBasePageState {
   int wrongInputCounter = 0;
diff --git a/lib/features/security/presentation/passcode_require/widgets/show_reset_passcode_dialog.dart b/lib/features/security/presentation/passcode_require/widgets/show_reset_passcode_dialog.dart
index 17490c38..14e78f99 100644
--- a/lib/features/security/presentation/passcode_require/widgets/show_reset_passcode_dialog.dart
+++ b/lib/features/security/presentation/passcode_require/widgets/show_reset_passcode_dialog.dart
@@ -1,7 +1,8 @@
 import 'dart:ui';
 
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/splash/splash.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/splash/splash.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -48,7 +49,7 @@ class ResetPasscode extends StatelessWidget {
                     Expanded(
                       child: Text(
                         FlutterI18n.translate(context, item),
-                        style: FontTheme.of(context).body1.primary(),
+                        style: FontTheme.of(context).body2.primary(),
                         textAlign: TextAlign.left,
                       ),
                     ),
@@ -88,12 +89,9 @@ class ResetPasscode extends StatelessWidget {
             ),
             const Padding(
               padding: EdgeInsets.symmetric(vertical: 8),
-              child: Image(
-                image: AssetImage(
-                  'assets/images/security/unlock.png',
-                ),
-                width: 80,
-                height: 80,
+              child: Icon(
+                MxcIcons.security,
+                size: 66,
               ),
             ),
             Text(
@@ -107,11 +105,12 @@ class ResetPasscode extends StatelessWidget {
             const SizedBox(height: 10),
             content(context),
             const SizedBox(height: 10),
-            MxcButton.secondary(
+            MxcButton.secondaryWhite(
               key: const ValueKey('logOutButton'),
               title: FlutterI18n.translate(context, 'log_out'),
-              size: AxsButtonSize.xl,
+              size: MXCWalletButtonSize.xl,
               onTap: onTap,
+              edgeType: UIConfig.securityScreensButtonsEdgeType,
             ),
             const SizedBox(height: 26),
           ],
diff --git a/lib/features/security/presentation/passcode_require/wrapper/passcode_require_wrapper_page.dart b/lib/features/security/presentation/passcode_require/wrapper/passcode_require_wrapper_page.dart
index 04702c2b..926fb9f9 100644
--- a/lib/features/security/presentation/passcode_require/wrapper/passcode_require_wrapper_page.dart
+++ b/lib/features/security/presentation/passcode_require/wrapper/passcode_require_wrapper_page.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
diff --git a/lib/features/security/presentation/passcode_require/wrapper/passcode_require_wrapper_presenter.dart b/lib/features/security/presentation/passcode_require/wrapper/passcode_require_wrapper_presenter.dart
index 173b34dc..0e14b2b2 100644
--- a/lib/features/security/presentation/passcode_require/wrapper/passcode_require_wrapper_presenter.dart
+++ b/lib/features/security/presentation/passcode_require/wrapper/passcode_require_wrapper_presenter.dart
@@ -1,6 +1,6 @@
-import 'package:datadashwallet/features/security/security.dart';
+import 'package:moonchain_wallet/features/security/security.dart';
 import 'package:flutter/widgets.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 
 import 'passcode_require_wrapper_state.dart';
 
diff --git a/lib/features/security/presentation/passcode_set/passcode_set_confirm_page/passcode_set_confirm_page.dart b/lib/features/security/presentation/passcode_set/passcode_set_confirm_page/passcode_set_confirm_page.dart
index 245c2893..ff432c3c 100644
--- a/lib/features/security/presentation/passcode_set/passcode_set_confirm_page/passcode_set_confirm_page.dart
+++ b/lib/features/security/presentation/passcode_set/passcode_set_confirm_page/passcode_set_confirm_page.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/features/security/security.dart';
+import 'package:moonchain_wallet/features/security/security.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
diff --git a/lib/features/security/presentation/passcode_set/passcode_set_confirm_page/passcode_set_confirm_page_presenter.dart b/lib/features/security/presentation/passcode_set/passcode_set_confirm_page/passcode_set_confirm_page_presenter.dart
index 3723fb58..919a0b86 100644
--- a/lib/features/security/presentation/passcode_set/passcode_set_confirm_page/passcode_set_confirm_page_presenter.dart
+++ b/lib/features/security/presentation/passcode_set/passcode_set_confirm_page/passcode_set_confirm_page_presenter.dart
@@ -1,7 +1,7 @@
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:collection/collection.dart';
-import 'package:datadashwallet/features/security/security.dart';
-import 'package:datadashwallet/features/splash/splash.dart';
+import 'package:moonchain_wallet/features/security/security.dart';
+import 'package:moonchain_wallet/features/splash/splash.dart';
 
 final passcodeSetConfirmPageContainer = PresenterContainerWithParameter<
     PasscodeSetConfirmPagePresenter,
@@ -32,6 +32,6 @@ class PasscodeSetConfirmPagePresenter extends PasscodeBasePagePresenter {
     _passcodeUseCase.setNeedSetPasscode(false);
     _passcodeUseCase.setPasscode(expectedNumbers.join());
 
-    pushMNSAnnouncementPage(context!);
+    pushWalletCreationNoticePage(context!);
   }
 }
diff --git a/lib/features/security/presentation/passcode_set/passcode_set_page/passcode_set_page.dart b/lib/features/security/presentation/passcode_set/passcode_set_page/passcode_set_page.dart
index 32fefb30..207a9d53 100644
--- a/lib/features/security/presentation/passcode_set/passcode_set_page/passcode_set_page.dart
+++ b/lib/features/security/presentation/passcode_set/passcode_set_page/passcode_set_page.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/features/security/security.dart';
+import 'package:moonchain_wallet/features/security/security.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
diff --git a/lib/features/security/presentation/passcode_set/passcode_set_page/passcode_set_page_presenter.dart b/lib/features/security/presentation/passcode_set/passcode_set_page/passcode_set_page_presenter.dart
index f43859dc..d7d03b3a 100644
--- a/lib/features/security/presentation/passcode_set/passcode_set_page/passcode_set_page_presenter.dart
+++ b/lib/features/security/presentation/passcode_set/passcode_set_page/passcode_set_page_presenter.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/security/security.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/security/security.dart';
 
 final passcodeSetPageContainer =
     PresenterContainer<PasscodeSetPagePresenter, PasscodeBasePageState>(
diff --git a/lib/features/security/presentation/setup_enable_biometric/setup_enable_biometric_page.dart b/lib/features/security/presentation/setup_enable_biometric/setup_enable_biometric_page.dart
index d71eba26..7c47f64f 100644
--- a/lib/features/security/presentation/setup_enable_biometric/setup_enable_biometric_page.dart
+++ b/lib/features/security/presentation/setup_enable_biometric/setup_enable_biometric_page.dart
@@ -1,8 +1,9 @@
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:moonchain_wallet/main.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 
 import 'setup_enable_biometric_presenter.dart';
@@ -28,23 +29,23 @@ class SetupEnableBiometricPage extends HookConsumerWidget {
             key: const ValueKey('useBiometricButton'),
             title: FlutterI18n.translate(context, 'use_biometric').replaceFirst(
                 '{0}',
-                FlutterI18n.translate(context, presenter.getAppBarTitle())
-                    .toLowerCase()),
+                FlutterI18n.translate(context, presenter.getAppBarTitle())),
             onTap: () => presenter.authenticateBiometrics(),
+            edgeType: UIConfig.securityScreensButtonsEdgeType,
           ),
           MxcButton.plainWhite(
             key: const ValueKey('createPasscodeButton'),
             title: FlutterI18n.translate(context, 'create_passcode'),
             onTap: () => presenter.createPasscode(),
+            edgeType: UIConfig.securityScreensButtonsEdgeType,
           ),
         ],
       ),
       children: [
-        const SizedBox(height: 75),
-        Image(
-          image: ImagesTheme.of(context).axs,
-          width: 80,
-          height: 80,
+        const SizedBox(height: 200),
+        Text(
+          appName,
+          style: FontTheme.of(context).logo(),
         ),
         Padding(
           padding: const EdgeInsets.symmetric(vertical: 16),
@@ -62,11 +63,11 @@ class SetupEnableBiometricPage extends HookConsumerWidget {
           style: FontTheme.of(context).h6.white(),
           textAlign: TextAlign.center,
         ),
-        const SizedBox(height: 43),
+        const SizedBox(height: 24),
         SvgPicture.asset(
           presenter.getSvg(),
-          height: 64,
-          width: 64,
+          height: 80,
+          width: 80,
           colorFilter: filterFor(ColorsTheme.of(context).iconWhite),
         ),
         const Spacer(),
diff --git a/lib/features/security/presentation/setup_enable_biometric/setup_enable_biometric_presenter.dart b/lib/features/security/presentation/setup_enable_biometric/setup_enable_biometric_presenter.dart
index 4168588b..0ef02bb0 100644
--- a/lib/features/security/presentation/setup_enable_biometric/setup_enable_biometric_presenter.dart
+++ b/lib/features/security/presentation/setup_enable_biometric/setup_enable_biometric_presenter.dart
@@ -1,10 +1,10 @@
 import 'dart:io';
 
-import 'package:datadashwallet/features/security/security.dart';
-import 'package:datadashwallet/features/splash/mns_process/mns.dart';
+import 'package:moonchain_wallet/features/security/security.dart';
+import 'package:moonchain_wallet/features/splash/mns_process/mns.dart';
 import 'package:local_auth/local_auth.dart';
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
 
 final setupEnableBiometricContainer =
     PresenterContainer<SetupEnableBiometricPresenter, void>(
diff --git a/lib/features/settings/domain/app_version_use_case.dart b/lib/features/settings/domain/app_version_use_case.dart
index 0b9e85dd..60333b94 100644
--- a/lib/features/settings/domain/app_version_use_case.dart
+++ b/lib/features/settings/domain/app_version_use_case.dart
@@ -1,7 +1,7 @@
 import 'dart:io';
 
 import 'package:android_metadata/android_metadata.dart';
-import 'package:datadashwallet/app/configuration.dart';
+import 'package:moonchain_wallet/app/configuration.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_app_update/flutter_app_update.dart';
 import 'package:mxc_logic/mxc_logic.dart';
diff --git a/lib/features/settings/entities/setting.dart b/lib/features/settings/entities/setting.dart
index c10bb8c5..c4c500fe 100644
--- a/lib/features/settings/entities/setting.dart
+++ b/lib/features/settings/entities/setting.dart
@@ -1,10 +1,10 @@
-import 'package:datadashwallet/features/settings/subfeatures/dapp_hooks/dapp_hooks_page.dart';
-import 'package:datadashwallet/features/settings/subfeatures/notifications/notificaitons_page.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/dapp_hooks/dapp_hooks_page.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/notifications/notificaitons_page.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 import 'package:mxc_logic/mxc_logic.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/settings.dart';
-import 'package:datadashwallet/features/settings/subfeatures/chain_configuration/chain_configuration_page.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/settings.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/chain_configuration/chain_configuration_page.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -27,7 +27,7 @@ class Setting {
     return [
       Setting(
         title: FlutterI18n.translate(context, 'security'),
-        icon: MxcIcons.security,
+        icon: MxcIcons.shield,
         page: const SecuritySettingsPage(),
       ),
       Setting(
diff --git a/lib/features/settings/presentation/settings_page.dart b/lib/features/settings/presentation/settings_page.dart
index 548c0454..7e25b8fa 100644
--- a/lib/features/settings/presentation/settings_page.dart
+++ b/lib/features/settings/presentation/settings_page.dart
@@ -1,7 +1,7 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/common/common.dart';
-import 'package:datadashwallet/features/settings/entities/setting.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
+import 'package:moonchain_wallet/features/settings/entities/setting.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -21,7 +21,6 @@ class SettingsPage extends HookConsumerWidget {
     return MxcPage(
       presenter: presenter,
       resizeToAvoidBottomInset: true,
-      backgroundColor: ColorsTheme.of(context).screenBackground,
       appBar: AppNavBar(
         title: Text(
           FlutterI18n.translate(context, 'settings'),
diff --git a/lib/features/settings/presentation/settings_page_presenter.dart b/lib/features/settings/presentation/settings_page_presenter.dart
index e44a0c78..142cfb13 100644
--- a/lib/features/settings/presentation/settings_page_presenter.dart
+++ b/lib/features/settings/presentation/settings_page_presenter.dart
@@ -1,6 +1,6 @@
 import 'package:clipboard/clipboard.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/settings.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/settings.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'package:package_info_plus/package_info_plus.dart';
diff --git a/lib/features/settings/presentation/widgets/account_managment/account_managment_panel.dart b/lib/features/settings/presentation/widgets/account_managment/account_managment_panel.dart
index d0020bca..66ecd1f2 100644
--- a/lib/features/settings/presentation/widgets/account_managment/account_managment_panel.dart
+++ b/lib/features/settings/presentation/widgets/account_managment/account_managment_panel.dart
@@ -1,8 +1,8 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/settings.dart';
-import 'package:datadashwallet/features/settings/subfeatures/accounts/show_accounts_dialog.dart';
-import 'package:datadashwallet/features/settings/subfeatures/accounts/subfeatures/import_account/import_account_page.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/settings.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/accounts/show_accounts_dialog.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/accounts/subfeatures/import_account/import_account_page.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -23,12 +23,16 @@ class AccountManagementPanel extends HookConsumerWidget {
         account?.address ?? '',
         nCharacters: 10);
 
-    return GreyContainer(
+    return Container(
         padding: const EdgeInsetsDirectional.only(
             bottom: Sizes.spaceSmall,
             top: Sizes.spaceSmall,
             start: Sizes.spaceNormal,
             end: Sizes.spaceSmall),
+        decoration: BoxDecoration(
+          borderRadius: UIConfig.defaultBorderRadiusAll,
+          color: const Color(0XFF212529),
+        ),
         child: Column(
           children: [
             InkWell(
diff --git a/lib/features/settings/presentation/widgets/account_managment/copyable_item.dart b/lib/features/settings/presentation/widgets/account_managment/copyable_item.dart
index dc0cd530..5773d2de 100644
--- a/lib/features/settings/presentation/widgets/account_managment/copyable_item.dart
+++ b/lib/features/settings/presentation/widgets/account_managment/copyable_item.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/features/settings/presentation/settings_page_presenter.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/features/settings/presentation/settings_page_presenter.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
diff --git a/lib/features/settings/presentation/widgets/settings_item.dart b/lib/features/settings/presentation/widgets/settings_item.dart
index 6a278ea0..3ba2a057 100644
--- a/lib/features/settings/presentation/widgets/settings_item.dart
+++ b/lib/features/settings/presentation/widgets/settings_item.dart
@@ -1,7 +1,7 @@
 import 'package:mxc_logic/mxc_logic.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/entities/setting.dart';
-import 'package:datadashwallet/features/settings/subfeatures/chain_configuration/chain_configuration_presenter.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/entities/setting.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/chain_configuration/chain_configuration_presenter.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
diff --git a/lib/features/settings/subfeatures/about_page/about_page.dart b/lib/features/settings/subfeatures/about_page/about_page.dart
index a825588c..01dd98fc 100644
--- a/lib/features/settings/subfeatures/about_page/about_page.dart
+++ b/lib/features/settings/subfeatures/about_page/about_page.dart
@@ -1,11 +1,12 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/features/common/common.dart';
-import 'package:datadashwallet/features/settings/presentation/settings_page_presenter.dart';
-import 'package:datadashwallet/features/settings/subfeatures/about_page/widgets/app_term.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
+import 'package:moonchain_wallet/features/settings/presentation/settings_page_presenter.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/about_page/widgets/app_term.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:moonchain_wallet/main.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 
@@ -25,11 +26,10 @@ class AboutPage extends HookConsumerWidget {
         ),
       ),
       children: [
-        Padding(
-          padding: const EdgeInsets.symmetric(vertical: Sizes.spaceNormal),
-          child: Image(
-            image: ImagesTheme.of(context).axs,
-          ),
+        const SizedBox(height: Sizes.space4XLarge),
+        Text(
+          appName,
+          style: FontTheme.of(context).logo(),
         ),
         Text(
           '${FlutterI18n.translate(context, 'app_version')}${settingsState.appVersion ?? ''}',
@@ -37,14 +37,14 @@ class AboutPage extends HookConsumerWidget {
                 color: ColorsTheme.of(context).textGrey1,
               ),
         ),
-        const SizedBox(height: Sizes.space2XLarge),
+        const SizedBox(height: Sizes.space10XLarge),
         const AppTerm(
           name: 'terms_and_service',
-          externalLink: Urls.axsTermsConditions,
+          externalLink: Urls.mxcWalletTermsConditions,
         ),
         const AppTerm(
           name: 'privacy_policy',
-          externalLink: Urls.axsPrivacy,
+          externalLink: Urls.mxcWalletPrivacy,
           isFile: true,
         ),
       ],
diff --git a/lib/features/settings/subfeatures/about_page/widgets/app_term.dart b/lib/features/settings/subfeatures/about_page/widgets/app_term.dart
index 2ecbccc4..7ecad7eb 100644
--- a/lib/features/settings/subfeatures/about_page/widgets/app_term.dart
+++ b/lib/features/settings/subfeatures/about_page/widgets/app_term.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -22,7 +22,7 @@ class AppTerm extends HookConsumerWidget {
 
     return InkWell(
       onTap: () => isFile
-          ? launcherUseCase.openAXSPrivacy(externalLink)
+          ? launcherUseCase.openMXCWalletPrivacy(externalLink)
           : launcherUseCase.launchUrlInExternalAppWithString(externalLink),
       child: Padding(
         padding: const EdgeInsets.symmetric(vertical: Sizes.spaceSmall),
diff --git a/lib/features/settings/subfeatures/accounts/account_item.dart b/lib/features/settings/subfeatures/accounts/account_item.dart
index 70de2da4..f3ef13dd 100644
--- a/lib/features/settings/subfeatures/accounts/account_item.dart
+++ b/lib/features/settings/subfeatures/accounts/account_item.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_logic/mxc_logic.dart';
diff --git a/lib/features/settings/subfeatures/accounts/show_accounts_dialog.dart b/lib/features/settings/subfeatures/accounts/show_accounts_dialog.dart
index c321eb4e..c59ff45d 100644
--- a/lib/features/settings/subfeatures/accounts/show_accounts_dialog.dart
+++ b/lib/features/settings/subfeatures/accounts/show_accounts_dialog.dart
@@ -1,5 +1,5 @@
+import 'package:moonchain_wallet/common/bottom_sheets/bottom_sheets.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'package:mxc_ui/mxc_ui.dart';
@@ -15,75 +15,57 @@ void showAccountsDialog(
     VoidCallback? onImport,
     required Function(Account) onSelect,
     required Function(Account) onRemove}) {
-  showModalBottomSheet<void>(
+  showBaseBottomSheet<void>(
     context: context,
-    useRootNavigator: true,
-    isScrollControlled: true,
-    useSafeArea: true,
-    backgroundColor: Colors.transparent,
-    builder: (BuildContext context) => ConstrainedBox(
-      constraints: BoxConstraints(
-        maxHeight: MediaQuery.of(context).size.height * 0.95,
-      ),
-      child: Container(
-        padding: const EdgeInsets.only(
-            left: 16, right: 16, top: 0, bottom: Sizes.space3XLarge),
-        decoration: BoxDecoration(
-          color: ColorsTheme.of(context).screenBackground,
-          borderRadius: const BorderRadius.only(
-            topLeft: Radius.circular(20),
-            topRight: Radius.circular(20),
+    content: Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        MxcAppBarEvenly.title(
+          titleText: FlutterI18n.translate(context, 'accounts'),
+          action: Container(
+            alignment: Alignment.centerRight,
+            child: InkWell(
+              child: const Icon(Icons.close),
+              onTap: () => Navigator.of(context).pop(false),
+            ),
           ),
         ),
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            MxcAppBarEvenly.title(
-              titleText: FlutterI18n.translate(context, 'accounts'),
-              action: Container(
-                alignment: Alignment.centerRight,
-                child: InkWell(
-                  child: const Icon(Icons.close),
-                  onTap: () => Navigator.of(context).pop(false),
-                ),
-              ),
-            ),
-            Flexible(
-              child: ListView.builder(
-                padding: EdgeInsets.zero,
-                itemCount: accounts.length,
-                shrinkWrap: true,
-                itemBuilder: (ctx, index) {
-                  return AccountItem(
-                    account: accounts[index],
-                    isSelected:
-                        currentAccount.address == accounts[index].address,
-                    onSelect: () => onSelect(accounts[index]),
-                    isCustom: accounts[index].isCustom,
-                    onRemove: onRemove,
-                  );
-                },
-              ),
-            ),
-            const SizedBox(height: Sizes.spaceXSmall),
-            MxcButton.primary(
-              key: const ValueKey('addAccountButton'),
-              title: FlutterI18n.translate(
-                  context, isLoading ? 'adding_account' : 'add_new_account'),
-              onTap: onAdd,
-              size: AxsButtonSize.xl,
-            ),
-            const SizedBox(height: Sizes.spaceXSmall),
-            MxcButton.plainWhite(
-              key: const ValueKey('importAccountButton'),
-              title: FlutterI18n.translate(context, 'import_account'),
-              onTap: onImport,
-              size: AxsButtonSize.xl,
-              titleColor: ColorsTheme.of(context).primary,
-            ),
-          ],
+        Flexible(
+          child: ListView.builder(
+            padding: EdgeInsets.zero,
+            itemCount: accounts.length,
+            shrinkWrap: true,
+            itemBuilder: (ctx, index) {
+              return AccountItem(
+                account: accounts[index],
+                isSelected: currentAccount.address == accounts[index].address,
+                onSelect: () => onSelect(accounts[index]),
+                isCustom: accounts[index].isCustom,
+                onRemove: onRemove,
+              );
+            },
+          ),
+        ),
+        const SizedBox(height: Sizes.spaceXSmall),
+        MxcButton.primary(
+          key: const ValueKey('addAccountButton'),
+          title: FlutterI18n.translate(
+              context, isLoading ? 'adding_account' : 'add_new_account'),
+          onTap: onAdd,
+          size: MXCWalletButtonSize.xl,
+        ),
+        const SizedBox(height: Sizes.spaceXSmall),
+        MxcButton.plainWhite(
+          key: const ValueKey('importAccountButton'),
+          title: FlutterI18n.translate(context, 'import_account'),
+          onTap: onImport,
+          size: MXCWalletButtonSize.xl,
+          titleColor: ColorsTheme.of(
+            context,
+            listen: false,
+          ).primary,
         ),
-      ),
+      ],
     ),
   );
 }
diff --git a/lib/features/settings/subfeatures/accounts/show_view_private_key_dialog.dart b/lib/features/settings/subfeatures/accounts/show_view_private_key_dialog.dart
index 78a25247..f021105b 100644
--- a/lib/features/settings/subfeatures/accounts/show_view_private_key_dialog.dart
+++ b/lib/features/settings/subfeatures/accounts/show_view_private_key_dialog.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_ui/mxc_ui.dart';
@@ -7,57 +7,43 @@ void showViewPrivateKeyDialog(
     {required BuildContext context,
     required String privateKey,
     required Function(String) onCopy}) {
-  showModalBottomSheet<void>(
+  showBaseBottomSheet<void>(
     context: context,
-    useRootNavigator: true,
-    isScrollControlled: true,
-    useSafeArea: true,
-    backgroundColor: Colors.transparent,
-    builder: (BuildContext context) => Container(
-      padding: const EdgeInsets.only(left: 16, right: 16, top: 0, bottom: 44),
-      decoration: BoxDecoration(
-        color: ColorsTheme.of(context).screenBackground,
-        borderRadius: const BorderRadius.only(
-          topLeft: Radius.circular(20),
-          topRight: Radius.circular(20),
-        ),
-      ),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          MxcAppBarEvenly.title(
-            titleText: FlutterI18n.translate(context, 'private_key'),
-            action: Container(
-              alignment: Alignment.centerRight,
-              child: InkWell(
-                child: const Icon(Icons.close),
-                onTap: () => Navigator.of(context).pop(false),
-              ),
+    content: Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        MxcAppBarEvenly.title(
+          titleText: FlutterI18n.translate(context, 'private_key'),
+          action: Container(
+            alignment: Alignment.centerRight,
+            child: InkWell(
+              child: const Icon(Icons.close),
+              onTap: () => Navigator.of(context).pop(false),
             ),
           ),
-          SingleLineInfoItem(
-            title: 'private_key',
-            value: privateKey,
-            valueActionIcon: IconButton(
-                icon: Icon(
-                  MxcIcons.copy,
-                  size: 20,
-                  color: ColorsTheme.of(context).iconGrey1,
-                ),
-                onPressed: () {
-                  onCopy(privateKey);
-                  Navigator.of(context).pop();
-                }),
-          ),
-          const SizedBox(height: Sizes.spaceXSmall),
-          MxcButton.primary(
-            key: const ValueKey('doneButton'),
-            title: FlutterI18n.translate(context, 'done'),
-            onTap: () => Navigator.of(context).pop(false),
-            size: AxsButtonSize.xl,
-          ),
-        ],
-      ),
+        ),
+        SingleLineInfoItem(
+          title: 'private_key',
+          value: privateKey,
+          valueActionIcon: IconButton(
+              icon: Icon(
+                MxcIcons.copy,
+                size: 20,
+                color: ColorsTheme.of(context, listen: false).iconGrey1,
+              ),
+              onPressed: () {
+                onCopy(privateKey);
+                Navigator.of(context).pop();
+              }),
+        ),
+        const SizedBox(height: Sizes.spaceXSmall),
+        MxcButton.primary(
+          key: const ValueKey('doneButton'),
+          title: FlutterI18n.translate(context, 'done'),
+          onTap: () => Navigator.of(context).pop(false),
+          size: MXCWalletButtonSize.xl,
+        ),
+      ],
     ),
   );
 }
diff --git a/lib/features/settings/subfeatures/accounts/subfeatures/import_account/import_account_page.dart b/lib/features/settings/subfeatures/accounts/subfeatures/import_account/import_account_page.dart
index 282c9de7..075ce77a 100644
--- a/lib/features/settings/subfeatures/accounts/subfeatures/import_account/import_account_page.dart
+++ b/lib/features/settings/subfeatures/accounts/subfeatures/import_account/import_account_page.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
diff --git a/lib/features/settings/subfeatures/accounts/subfeatures/import_account/import_account_presenter.dart b/lib/features/settings/subfeatures/accounts/subfeatures/import_account/import_account_presenter.dart
index 57c521f7..f778e077 100644
--- a/lib/features/settings/subfeatures/accounts/subfeatures/import_account/import_account_presenter.dart
+++ b/lib/features/settings/subfeatures/accounts/subfeatures/import_account/import_account_presenter.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/domain/webview_use_case.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/domain/webview_use_case.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'package:mxc_ui/mxc_ui.dart';
diff --git a/lib/features/settings/subfeatures/address_book/domain/recipients_repository.dart b/lib/features/settings/subfeatures/address_book/domain/recipients_repository.dart
index b09c55f4..825f4f13 100644
--- a/lib/features/settings/subfeatures/address_book/domain/recipients_repository.dart
+++ b/lib/features/settings/subfeatures/address_book/domain/recipients_repository.dart
@@ -1,6 +1,6 @@
-import 'package:datadashwallet/features/settings/subfeatures/address_book/entities/recipient.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/address_book/entities/recipient.dart';
 import 'package:mxc_logic/mxc_logic.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 
 class RecipientsRepository extends ControlledCacheRepository {
   @override
diff --git a/lib/features/settings/subfeatures/address_book/domain/recipients_use_case.dart b/lib/features/settings/subfeatures/address_book/domain/recipients_use_case.dart
index f8316658..2bff2929 100644
--- a/lib/features/settings/subfeatures/address_book/domain/recipients_use_case.dart
+++ b/lib/features/settings/subfeatures/address_book/domain/recipients_use_case.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 
 import '../entities/recipient.dart';
 import 'recipients_repository.dart';
diff --git a/lib/features/settings/subfeatures/address_book/presentation/edit_recipient/edit_recipient_page.dart b/lib/features/settings/subfeatures/address_book/presentation/edit_recipient/edit_recipient_page.dart
index 7a03888b..535efd1f 100644
--- a/lib/features/settings/subfeatures/address_book/presentation/edit_recipient/edit_recipient_page.dart
+++ b/lib/features/settings/subfeatures/address_book/presentation/edit_recipient/edit_recipient_page.dart
@@ -1,6 +1,6 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/features/settings/subfeatures/qr_code/qr_scanner/qr_scanner_page.dart';
-import 'package:datadashwallet/features/settings/subfeatures/qr_code/show_qa_code/qr_code_page.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/qr_code/qr_scanner/qr_scanner_page.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/qr_code/show_qa_code/qr_code_page.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
diff --git a/lib/features/settings/subfeatures/address_book/presentation/edit_recipient/edit_recipient_presenter.dart b/lib/features/settings/subfeatures/address_book/presentation/edit_recipient/edit_recipient_presenter.dart
index 852ecb67..d3806c81 100644
--- a/lib/features/settings/subfeatures/address_book/presentation/edit_recipient/edit_recipient_presenter.dart
+++ b/lib/features/settings/subfeatures/address_book/presentation/edit_recipient/edit_recipient_presenter.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/subfeatures/address_book/entities/recipient.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/address_book/entities/recipient.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 import 'package:mxc_logic/mxc_logic.dart';
diff --git a/lib/features/settings/subfeatures/address_book/presentation/select_recipient/select_recipient_page.dart b/lib/features/settings/subfeatures/address_book/presentation/select_recipient/select_recipient_page.dart
index bba06e28..af93e7fa 100644
--- a/lib/features/settings/subfeatures/address_book/presentation/select_recipient/select_recipient_page.dart
+++ b/lib/features/settings/subfeatures/address_book/presentation/select_recipient/select_recipient_page.dart
@@ -1,6 +1,6 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/subfeatures/address_book/presentation/edit_recipient/edit_recipient_page.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/address_book/presentation/edit_recipient/edit_recipient_page.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
diff --git a/lib/features/settings/subfeatures/address_book/presentation/select_recipient/select_recipient_presenter.dart b/lib/features/settings/subfeatures/address_book/presentation/select_recipient/select_recipient_presenter.dart
index b2f0b0c9..34811f10 100644
--- a/lib/features/settings/subfeatures/address_book/presentation/select_recipient/select_recipient_presenter.dart
+++ b/lib/features/settings/subfeatures/address_book/presentation/select_recipient/select_recipient_presenter.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 
 import 'select_recipient_state.dart';
diff --git a/lib/features/settings/subfeatures/chain_configuration/chain_configuration_page.dart b/lib/features/settings/subfeatures/chain_configuration/chain_configuration_page.dart
index d9fed9f8..867ea026 100644
--- a/lib/features/settings/subfeatures/chain_configuration/chain_configuration_page.dart
+++ b/lib/features/settings/subfeatures/chain_configuration/chain_configuration_page.dart
@@ -1,7 +1,7 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/common/common.dart';
-import 'package:datadashwallet/features/settings/subfeatures/chain_configuration/chain_configuration.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/chain_configuration/chain_configuration.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
@@ -21,7 +21,6 @@ class ChainConfigurationPage extends HookConsumerWidget {
     return MxcPage(
       presenter: presenter,
       resizeToAvoidBottomInset: true,
-      backgroundColor: ColorsTheme.of(context).screenBackground,
       layout: LayoutType.column,
       useContentPadding: false,
       childrenPadding: const EdgeInsets.only(
@@ -58,6 +57,7 @@ class ChainConfigurationPage extends HookConsumerWidget {
             MxcButton.secondary(
               key: const ValueKey('addNetworkButton'),
               title: translate('add_network'),
+              edgeType: UIConfig.settingsScreensButtonsEdgeType,
               onTap: () {
                 Navigator.of(context).push(
                   route.featureDialog(
@@ -65,7 +65,7 @@ class ChainConfigurationPage extends HookConsumerWidget {
                   ),
                 );
               },
-              size: AxsButtonSize.xl,
+              size: MXCWalletButtonSize.xl,
             ),
             const SizedBox(
               height: Sizes.space4XLarge,
diff --git a/lib/features/settings/subfeatures/chain_configuration/chain_configuration_presenter.dart b/lib/features/settings/subfeatures/chain_configuration/chain_configuration_presenter.dart
index a7d160da..8922500a 100644
--- a/lib/features/settings/subfeatures/chain_configuration/chain_configuration_presenter.dart
+++ b/lib/features/settings/subfeatures/chain_configuration/chain_configuration_presenter.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/settings.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/settings.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'chain_configuration_state.dart';
diff --git a/lib/features/settings/subfeatures/chain_configuration/domain/chain_configuration_repository.dart b/lib/features/settings/subfeatures/chain_configuration/domain/chain_configuration_repository.dart
index 954e0894..ed2d9b50 100644
--- a/lib/features/settings/subfeatures/chain_configuration/domain/chain_configuration_repository.dart
+++ b/lib/features/settings/subfeatures/chain_configuration/domain/chain_configuration_repository.dart
@@ -1,5 +1,5 @@
 import 'package:mxc_logic/mxc_logic.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 
 class ChainConfigurationRepository extends GlobalCacheRepository {
   @override
diff --git a/lib/features/settings/subfeatures/chain_configuration/domain/chain_configuration_use_case.dart b/lib/features/settings/subfeatures/chain_configuration/domain/chain_configuration_use_case.dart
index a0930ede..92e0a317 100644
--- a/lib/features/settings/subfeatures/chain_configuration/domain/chain_configuration_use_case.dart
+++ b/lib/features/settings/subfeatures/chain_configuration/domain/chain_configuration_use_case.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/settings.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/settings.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
 import 'chain_configuration_repository.dart';
diff --git a/lib/features/settings/subfeatures/chain_configuration/subfeatures/add_custom_network/add_custom_network_page.dart b/lib/features/settings/subfeatures/chain_configuration/subfeatures/add_custom_network/add_custom_network_page.dart
index 7f158251..e2b99a9e 100644
--- a/lib/features/settings/subfeatures/chain_configuration/subfeatures/add_custom_network/add_custom_network_page.dart
+++ b/lib/features/settings/subfeatures/chain_configuration/subfeatures/add_custom_network/add_custom_network_page.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
diff --git a/lib/features/settings/subfeatures/chain_configuration/subfeatures/add_custom_network/add_custom_network_presenter.dart b/lib/features/settings/subfeatures/chain_configuration/subfeatures/add_custom_network/add_custom_network_presenter.dart
index 4838b4ee..47b03ade 100644
--- a/lib/features/settings/subfeatures/chain_configuration/subfeatures/add_custom_network/add_custom_network_presenter.dart
+++ b/lib/features/settings/subfeatures/chain_configuration/subfeatures/add_custom_network/add_custom_network_presenter.dart
@@ -1,9 +1,9 @@
 import 'dart:developer';
 
-import 'package:datadashwallet/app/app.dart';
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/settings.dart';
+import 'package:moonchain_wallet/app/app.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/settings.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'package:mxc_logic/src/domain/entities/network.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/features/settings/subfeatures/chain_configuration/subfeatures/add_network/add_network_page.dart b/lib/features/settings/subfeatures/chain_configuration/subfeatures/add_network/add_network_page.dart
index e0218400..bfaeed85 100644
--- a/lib/features/settings/subfeatures/chain_configuration/subfeatures/add_network/add_network_page.dart
+++ b/lib/features/settings/subfeatures/chain_configuration/subfeatures/add_network/add_network_page.dart
@@ -1,7 +1,7 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/subfeatures/chain_configuration/subfeatures/add_custom_network/add_custom_network_page.dart';
-import 'package:datadashwallet/features/settings/subfeatures/chain_configuration/subfeatures/add_network/utils/add_network_utils.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/chain_configuration/subfeatures/add_custom_network/add_custom_network_page.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/chain_configuration/subfeatures/add_network/utils/add_network_utils.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -75,7 +75,8 @@ class AddNetworkPage extends HookConsumerWidget {
               ),
             );
           },
-          size: AxsButtonSize.xl,
+          size: MXCWalletButtonSize.xl,
+          edgeType: MXCWalletButtonEdgeType.hard,
         ),
       ],
     );
diff --git a/lib/features/settings/subfeatures/chain_configuration/subfeatures/add_network/add_network_presenter.dart b/lib/features/settings/subfeatures/chain_configuration/subfeatures/add_network/add_network_presenter.dart
index acad8ff9..c279dc47 100644
--- a/lib/features/settings/subfeatures/chain_configuration/subfeatures/add_network/add_network_presenter.dart
+++ b/lib/features/settings/subfeatures/chain_configuration/subfeatures/add_network/add_network_presenter.dart
@@ -1,8 +1,8 @@
 import 'package:clipboard/clipboard.dart';
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/settings.dart';
-import 'package:datadashwallet/features/settings/subfeatures/chain_configuration/subfeatures/add_network/widgets/switch_network_dialog.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/settings.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/chain_configuration/subfeatures/add_network/widgets/switch_network_dialog.dart';
 import 'package:mxc_logic/src/domain/entities/network.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
diff --git a/lib/features/settings/subfeatures/chain_configuration/subfeatures/add_network/widgets/switch_network_dialog.dart b/lib/features/settings/subfeatures/chain_configuration/subfeatures/add_network/widgets/switch_network_dialog.dart
index 60c291cb..777e314c 100644
--- a/lib/features/settings/subfeatures/chain_configuration/subfeatures/add_network/widgets/switch_network_dialog.dart
+++ b/lib/features/settings/subfeatures/chain_configuration/subfeatures/add_network/widgets/switch_network_dialog.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:mxc_logic/src/domain/entities/network.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:mxc_logic/mxc_logic.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_ui/mxc_ui.dart';
@@ -11,67 +11,49 @@ Future<bool?> showSwitchNetworkDialog(
 }) {
   String translate(String text) => FlutterI18n.translate(context, text);
 
-  return showModalBottomSheet<bool>(
+  return showBaseBottomSheet<bool>(
     context: context,
-    useRootNavigator: true,
-    isScrollControlled: true,
-    useSafeArea: true,
-    backgroundColor: Colors.transparent,
-    builder: (BuildContext context) => Container(
-      padding: const EdgeInsets.only(
-          top: Sizes.spaceNormal, bottom: Sizes.space3XLarge),
-      decoration: BoxDecoration(
-        color: ColorsTheme.of(context).layerSheetBackground,
-        borderRadius: const BorderRadius.only(
-          topLeft: Radius.circular(20),
-          topRight: Radius.circular(20),
+    content: Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Padding(
+          padding: const EdgeInsetsDirectional.only(
+              start: Sizes.spaceNormal,
+              end: Sizes.spaceNormal,
+              bottom: Sizes.space2XLarge),
+          child: MxcAppBarEvenly.title(
+            titleText: translate('new_network_added'),
+          ),
         ),
-      ),
-      child: Padding(
-        padding: const EdgeInsetsDirectional.symmetric(
-          horizontal: Sizes.spaceXLarge,
+        Text(
+          translate('x_is_now_available')
+              .replaceFirst('{0}', network.label ?? network.web3RpcHttpUrl),
+          style: FontTheme.of(context, listen: false).body2.primary(),
+          textAlign: TextAlign.center,
         ),
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            Padding(
-              padding: const EdgeInsetsDirectional.only(
-                  start: Sizes.spaceNormal,
-                  end: Sizes.spaceNormal,
-                  bottom: Sizes.space2XLarge),
-              child: MxcAppBarEvenly.title(
-                titleText: translate('new_network_added'),
-              ),
-            ),
-            Text(
-              translate('x_is_now_available')
-                  .replaceFirst('{0}', network.label ?? network.web3RpcHttpUrl),
-              style: FontTheme.of(context).body2.primary(),
-              textAlign: TextAlign.center,
-            ),
-            const SizedBox(
-              height: Sizes.spaceXLarge,
-            ),
-            MxcButton.secondary(
-              key: const ValueKey('closeButton'),
-              title: translate('close'),
-              onTap: () => Navigator.of(context).pop(false),
-              size: AxsButtonSize.xl,
-            ),
-            const SizedBox(
-              height: Sizes.spaceXLarge,
-            ),
-            MxcButton.primary(
-              key: const ValueKey('switchToNetwork'),
-              title: translate('switch_to_network'),
-              onTap: () {
-                onSwitch(network);
-              },
-              size: AxsButtonSize.xl,
-            ),
-          ],
+        const SizedBox(
+          height: Sizes.spaceXLarge,
         ),
-      ),
+        MxcButton.secondary(
+          key: const ValueKey('closeButton'),
+          title: translate('close'),
+          onTap: () => Navigator.of(context).pop(false),
+          size: MXCWalletButtonSize.xl,
+          edgeType: MXCWalletButtonEdgeType.hard,
+        ),
+        const SizedBox(
+          height: Sizes.spaceXLarge,
+        ),
+        MxcButton.primary(
+          key: const ValueKey('switchToNetwork'),
+          title: translate('switch_to_network'),
+          onTap: () {
+            onSwitch(network);
+          },
+          size: MXCWalletButtonSize.xl,
+          edgeType: MXCWalletButtonEdgeType.hard,
+        ),
+      ],
     ),
   );
 }
diff --git a/lib/features/settings/subfeatures/chain_configuration/subfeatures/delete_custom_network/delete_custom_network_page.dart b/lib/features/settings/subfeatures/chain_configuration/subfeatures/delete_custom_network/delete_custom_network_page.dart
index 46d771b5..7163d7a5 100644
--- a/lib/features/settings/subfeatures/chain_configuration/subfeatures/delete_custom_network/delete_custom_network_page.dart
+++ b/lib/features/settings/subfeatures/chain_configuration/subfeatures/delete_custom_network/delete_custom_network_page.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
@@ -144,7 +144,7 @@ class DeleteCustomNetworkPage extends HookConsumerWidget {
                             presenter.setAsDefault();
                             BottomFlowDialog.of(context).close();
                           },
-                          size: AxsButtonSize.xl,
+                          size: MXCWalletButtonSize.xl,
                         ),
                       ],
                     )
@@ -160,7 +160,8 @@ class DeleteCustomNetworkPage extends HookConsumerWidget {
                   presenter.deleteNetwork();
                   BottomFlowDialog.of(context).close();
                 },
-                size: AxsButtonSize.xl,
+                size: MXCWalletButtonSize.xl,
+                edgeType: UIConfig.settingsScreensButtonsEdgeType,
               ),
             ],
           ),
diff --git a/lib/features/settings/subfeatures/chain_configuration/subfeatures/delete_custom_network/delete_custom_network_presenter.dart b/lib/features/settings/subfeatures/chain_configuration/subfeatures/delete_custom_network/delete_custom_network_presenter.dart
index 28076827..a4491f42 100644
--- a/lib/features/settings/subfeatures/chain_configuration/subfeatures/delete_custom_network/delete_custom_network_presenter.dart
+++ b/lib/features/settings/subfeatures/chain_configuration/subfeatures/delete_custom_network/delete_custom_network_presenter.dart
@@ -1,7 +1,7 @@
-import 'package:datadashwallet/app/app.dart';
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/settings.dart';
+import 'package:moonchain_wallet/app/app.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/settings.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_logic/mxc_logic.dart';
diff --git a/lib/features/settings/subfeatures/chain_configuration/widgets/chains_dialog.dart b/lib/features/settings/subfeatures/chain_configuration/widgets/chains_dialog.dart
index cac0b8d3..6247df21 100644
--- a/lib/features/settings/subfeatures/chain_configuration/widgets/chains_dialog.dart
+++ b/lib/features/settings/subfeatures/chain_configuration/widgets/chains_dialog.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:mxc_logic/src/domain/entities/network.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:mxc_logic/mxc_logic.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_ui/mxc_ui.dart';
@@ -12,79 +12,68 @@ Future<bool?> showChainsDialog(BuildContext context,
     required selectedChainId}) {
   String translate(String text) => FlutterI18n.translate(context, text);
 
-  return showModalBottomSheet<bool>(
+  return showBaseBottomSheet<bool>(
     context: context,
-    useRootNavigator: true,
-    isScrollControlled: true,
-    useSafeArea: true,
-    backgroundColor: Colors.transparent,
-    builder: (BuildContext context) => Container(
-      padding: const EdgeInsets.only(
-          top: Sizes.spaceNormal, bottom: Sizes.space3XLarge),
-      decoration: BoxDecoration(
-        color: ColorsTheme.of(context).layerSheetBackground,
-        borderRadius: const BorderRadius.only(
-          topLeft: Radius.circular(20),
-          topRight: Radius.circular(20),
-        ),
-      ),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          Padding(
-            padding: const EdgeInsetsDirectional.only(
-                start: Sizes.spaceNormal,
-                end: Sizes.spaceNormal,
-                bottom: Sizes.space2XLarge),
-            child: MxcAppBarEvenly.title(
-              titleText:
-                  translate('select_x').replaceFirst('{0}', translate('chain')),
-              action: Container(
-                alignment: Alignment.centerRight,
-                child: InkWell(
-                  child: Icon(MxcIcons.close,
-                      size: 32, color: ColorsTheme.of(context).iconPrimary),
-                  onTap: () => Navigator.of(context).pop(false),
-                ),
+    content: Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Padding(
+          padding: const EdgeInsetsDirectional.only(
+              start: Sizes.spaceNormal,
+              end: Sizes.spaceNormal,
+              bottom: Sizes.space2XLarge),
+          child: MxcAppBarEvenly.title(
+            titleText:
+                translate('select_x').replaceFirst('{0}', translate('chain')),
+            action: Container(
+              alignment: Alignment.centerRight,
+              child: InkWell(
+                child: Icon(MxcIcons.close,
+                    size: 32,
+                    color: ColorsTheme.of(context, listen: false).iconPrimary),
+                onTap: () => Navigator.of(context).pop(false),
               ),
             ),
           ),
-          ...networks
-              .map((e) => InkWell(
-                    onTap: () {
-                      onTap(e.chainId);
-                      Navigator.of(context).pop(false);
-                    },
-                    child: Padding(
-                      padding: const EdgeInsets.symmetric(
-                          vertical: Sizes.spaceSmall,
-                          horizontal: Sizes.spaceXLarge),
-                      child: Row(children: [
-                        ChainLogoWidget(logo: e.logo),
-                        const SizedBox(
-                          width: Sizes.spaceXSmall,
-                        ),
-                        Text(
-                          e.label ?? e.web3RpcHttpUrl,
-                          style: FontTheme.of(context).body2.primary(),
-                        ),
-                        const Spacer(),
-                        if (selectedChainId == e.chainId)
-                          Padding(
-                            padding: const EdgeInsets.symmetric(
-                                horizontal: Sizes.spaceNormal),
-                            child: Icon(
-                              MxcIcons.check,
-                              size: 24,
-                              color: ColorsTheme.of(context).white400,
-                            ),
+        ),
+        ...networks
+            .map((e) => InkWell(
+                  onTap: () {
+                    onTap(e.chainId);
+                    Navigator.of(context).pop(false);
+                  },
+                  child: Padding(
+                    padding: const EdgeInsets.symmetric(
+                        vertical: Sizes.spaceSmall,
+                        horizontal: Sizes.spaceXLarge),
+                    child: Row(children: [
+                      ChainLogoWidget(logo: e.logo),
+                      const SizedBox(
+                        width: Sizes.spaceXSmall,
+                      ),
+                      Text(
+                        e.label ?? e.web3RpcHttpUrl,
+                        style: FontTheme.of(context, listen: false)
+                            .body2
+                            .primary(),
+                      ),
+                      const Spacer(),
+                      if (selectedChainId == e.chainId)
+                        Padding(
+                          padding: const EdgeInsets.symmetric(
+                              horizontal: Sizes.spaceNormal),
+                          child: Icon(
+                            MxcIcons.check,
+                            size: 24,
+                            color:
+                                ColorsTheme.of(context, listen: false).white400,
                           ),
-                      ]),
-                    ),
-                  ))
-              .toList(),
-        ],
-      ),
+                        ),
+                    ]),
+                  ),
+                ))
+            .toList(),
+      ],
     ),
   );
 }
diff --git a/lib/features/settings/subfeatures/chain_configuration/widgets/ipfs_gate_ways_dialog.dart b/lib/features/settings/subfeatures/chain_configuration/widgets/ipfs_gate_ways_dialog.dart
index 5f3dd1ef..640c853f 100644
--- a/lib/features/settings/subfeatures/chain_configuration/widgets/ipfs_gate_ways_dialog.dart
+++ b/lib/features/settings/subfeatures/chain_configuration/widgets/ipfs_gate_ways_dialog.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_ui/mxc_ui.dart';
@@ -9,85 +9,74 @@ Future<bool?> showIpfsGateWayDialog(BuildContext context,
     required selectedIpfsGateway}) {
   String translate(String text) => FlutterI18n.translate(context, text);
 
-  return showModalBottomSheet<bool>(
+  return showBaseBottomSheet<bool>(
     context: context,
-    useRootNavigator: true,
-    isScrollControlled: true,
-    useSafeArea: true,
-    backgroundColor: Colors.transparent,
-    builder: (BuildContext context) => Container(
-      padding: const EdgeInsets.only(
-          top: Sizes.spaceNormal, bottom: Sizes.space3XLarge),
-      decoration: BoxDecoration(
-        color: ColorsTheme.of(context).layerSheetBackground,
-        borderRadius: const BorderRadius.only(
-          topLeft: Radius.circular(20),
-          topRight: Radius.circular(20),
-        ),
-      ),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          Padding(
-            padding: const EdgeInsetsDirectional.only(
-                start: Sizes.spaceNormal,
-                end: Sizes.spaceNormal,
-                bottom: Sizes.space2XLarge),
-            child: MxcAppBarEvenly.title(
-              titleText: translate('select_x')
-                  .replaceFirst('{0}', translate('ipfs_gateway')),
-              action: Container(
-                alignment: Alignment.centerRight,
-                child: InkWell(
-                  child: Icon(
-                    MxcIcons.close,
-                    size: 32,
-                    color: ColorsTheme.of(context).iconPrimary,
-                  ),
-                  onTap: () => Navigator.of(context).pop(false),
+    content: Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Padding(
+          padding: const EdgeInsetsDirectional.only(
+              start: Sizes.spaceNormal,
+              end: Sizes.spaceNormal,
+              bottom: Sizes.space2XLarge),
+          child: MxcAppBarEvenly.title(
+            titleText: translate('select_x')
+                .replaceFirst('{0}', translate('ipfs_gateway')),
+            action: Container(
+              alignment: Alignment.centerRight,
+              child: InkWell(
+                child: Icon(
+                  MxcIcons.close,
+                  size: 32,
+                  color: ColorsTheme.of(context, listen: false).iconPrimary,
                 ),
+                onTap: () => Navigator.of(context).pop(false),
               ),
             ),
           ),
-          ...ipfsGateWays
-              .map((e) => InkWell(
-                    onTap: () {
-                      onTap(e);
-                      Navigator.of(context).pop(false);
-                    },
-                    child: Row(
-                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      children: [
-                        Flexible(
-                          child: Container(
-                            padding: const EdgeInsets.symmetric(
-                                horizontal: Sizes.spaceXLarge,
-                                vertical: Sizes.spaceSmall),
-                            alignment: AlignmentDirectional.centerStart,
-                            child: Text(
-                              e,
-                              style: FontTheme.of(context).body2.primary(),
-                              softWrap: true,
-                              overflow: TextOverflow.ellipsis,
-                            ),
+        ),
+        ...ipfsGateWays
+            .map((e) => InkWell(
+                  onTap: () {
+                    onTap(e);
+                    Navigator.of(context).pop(false);
+                  },
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Flexible(
+                        child: Container(
+                          padding: const EdgeInsets.symmetric(
+                              horizontal: Sizes.spaceXLarge,
+                              vertical: Sizes.spaceSmall),
+                          alignment: AlignmentDirectional.centerStart,
+                          child: Text(
+                            e,
+                            style: FontTheme.of(
+                              context,
+                              listen: false,
+                            ).body2.primary(),
+                            softWrap: true,
+                            overflow: TextOverflow.ellipsis,
                           ),
                         ),
-                        if (selectedIpfsGateway == e)
-                          Padding(
-                            padding: const EdgeInsets.symmetric(
-                                horizontal: Sizes.spaceNormal),
-                            child: Icon(
-                              MxcIcons.check,
-                              size: 24,
-                              color: ColorsTheme.of(context).white400,
-                            ),
+                      ),
+                      if (selectedIpfsGateway == e)
+                        Padding(
+                          padding: const EdgeInsets.symmetric(
+                              horizontal: Sizes.spaceNormal),
+                          child: Icon(
+                            MxcIcons.check,
+                            size: 24,
+                            color:
+                                ColorsTheme.of(context, listen: false).white400,
                           ),
-                      ],
-                    ),
-                  ))
-              .toList(),
-        ],
-      ),
+                        ),
+                    ],
+                  ),
+                ))
+            .toList(),
+      ],
     ),
   );
 }
diff --git a/lib/features/settings/subfeatures/chain_configuration/widgets/network_details_page.dart b/lib/features/settings/subfeatures/chain_configuration/widgets/network_details_page.dart
index 7b3f6f69..302c61d0 100644
--- a/lib/features/settings/subfeatures/chain_configuration/widgets/network_details_page.dart
+++ b/lib/features/settings/subfeatures/chain_configuration/widgets/network_details_page.dart
@@ -1,11 +1,11 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/subfeatures/chain_configuration/chain_configuration_presenter.dart';
-import 'package:datadashwallet/features/settings/subfeatures/chain_configuration/chain_configuration_state.dart';
-import 'package:mxc_logic/src/domain/entities/network.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/chain_configuration/chain_configuration_presenter.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/chain_configuration/chain_configuration_state.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:mxc_logic/mxc_logic.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 
 class NetworkDetailsPage extends HookConsumerWidget {
@@ -31,6 +31,8 @@ class NetworkDetailsPage extends HookConsumerWidget {
     return MxcPage.layer(
       presenter: ref.watch(presenter),
       crossAxisAlignment: CrossAxisAlignment.start,
+      backgroundColor: ColorsTheme.of(context).backgroundLightGrey,
+      upperBackgroundColor: ColorsTheme.of(context).layerSheetBackground,
       children: [
         MxcAppBarEvenly.text(
           titleText: network.label ?? network.web3RpcHttpUrl,
@@ -54,11 +56,12 @@ class NetworkDetailsPage extends HookConsumerWidget {
             ? MxcButton.secondary(
                 key: const ValueKey('setAsDefaultButton'),
                 title: translate('set_as_default'),
+                edgeType: UIConfig.settingsScreensButtonsEdgeType,
                 onTap: () {
                   ref.read(presenter).setAsDefault(network);
                   BottomFlowDialog.of(context).close();
                 },
-                size: AxsButtonSize.xl,
+                size: MXCWalletButtonSize.xl,
               )
             : Container()
       ],
diff --git a/lib/features/settings/subfeatures/chain_configuration/widgets/network_item.dart b/lib/features/settings/subfeatures/chain_configuration/widgets/network_item.dart
index 64878565..b273a50c 100644
--- a/lib/features/settings/subfeatures/chain_configuration/widgets/network_item.dart
+++ b/lib/features/settings/subfeatures/chain_configuration/widgets/network_item.dart
@@ -1,8 +1,8 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/subfeatures/chain_configuration/chain_configuration_presenter.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/chain_configuration/chain_configuration_presenter.dart';
 import 'package:mxc_logic/src/domain/entities/network.dart';
-import 'package:datadashwallet/features/settings/subfeatures/chain_configuration/subfeatures/delete_custom_network/delete_custom_network_page.dart';
-import 'package:datadashwallet/features/settings/subfeatures/chain_configuration/widgets/chain_logo_widget.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/chain_configuration/subfeatures/delete_custom_network/delete_custom_network_page.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/chain_configuration/widgets/chain_logo_widget.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import './network_details_page.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/features/settings/subfeatures/customer_support/customer_support_page.dart b/lib/features/settings/subfeatures/customer_support/customer_support_page.dart
index ccc38f7d..b7bc7196 100644
--- a/lib/features/settings/subfeatures/customer_support/customer_support_page.dart
+++ b/lib/features/settings/subfeatures/customer_support/customer_support_page.dart
@@ -1,6 +1,6 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/features/common/common.dart';
-import 'package:datadashwallet/features/settings/subfeatures/customer_support/widget/customer_support_button.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/customer_support/widget/customer_support_button.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
@@ -48,7 +48,8 @@ class CustomerSupportPage extends HookConsumerWidget {
         MxcButton.secondary(
           key: const ValueKey('exportLogsButton'),
           title: FlutterI18n.translate(context, 'export_logs'),
-          size: AxsButtonSize.xl,
+          size: MXCWalletButtonSize.xl,
+          edgeType: UIConfig.settingsScreensButtonsEdgeType,
           onTap: () => ref.read(presenter).exportedLogs(),
         ),
         if (ref.watch(state.select((v) => v.exportedLogsPath)).isNotEmpty) ...[
@@ -68,7 +69,7 @@ class CustomerSupportPage extends HookConsumerWidget {
             buttonFunction: ref.read(presenter).launchMXCZendesk),
         CustomerSupportButton(
             key: const ValueKey('browseDocuments'),
-            title: translate('mxc_design_documents'),
+            title: translate('moonchain_design_documents'),
             buttonLabel: translate('browse_documents'),
             buttonFunction: ref.read(presenter).launchMXCDesignDocs),
         CustomerSupportButton(
diff --git a/lib/features/settings/subfeatures/customer_support/customer_support_presenter.dart b/lib/features/settings/subfeatures/customer_support/customer_support_presenter.dart
index 256a37e4..96865802 100644
--- a/lib/features/settings/subfeatures/customer_support/customer_support_presenter.dart
+++ b/lib/features/settings/subfeatures/customer_support/customer_support_presenter.dart
@@ -2,7 +2,7 @@ import 'dart:io';
 import 'package:flutter/cupertino.dart';
 import 'package:share_plus/share_plus.dart';
 import 'package:appinio_social_share/appinio_social_share.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:f_logs/f_logs.dart';
 import 'customer_support_state.dart';
 
@@ -70,10 +70,10 @@ class CustomerSupportPresenter extends CompletePresenter<CustomerSupportState> {
   }
 
   Future<void> launchMXCKnowledgeHub() async {
-    return _launcherUseCase.launchMXCKnowledgeHub();
+    return _launcherUseCase.launchMoonchainWebsite();
   }
 
   Future<void> launchMXCDesignDocs() async {
-    return _launcherUseCase.launchMXCDesignDocs();
+    return _launcherUseCase.launchMoonchainDesignDocs();
   }
 }
diff --git a/lib/features/settings/subfeatures/customer_support/widget/customer_support_button.dart b/lib/features/settings/subfeatures/customer_support/widget/customer_support_button.dart
index a1963a92..357f6c31 100644
--- a/lib/features/settings/subfeatures/customer_support/widget/customer_support_button.dart
+++ b/lib/features/settings/subfeatures/customer_support/widget/customer_support_button.dart
@@ -1,3 +1,4 @@
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 
@@ -25,7 +26,8 @@ class CustomerSupportButton extends StatelessWidget {
         MxcButton.secondary(
           key: key,
           title: buttonLabel,
-          size: AxsButtonSize.xl,
+          size: MXCWalletButtonSize.xl,
+          edgeType: UIConfig.settingsScreensButtonsEdgeType,
           onTap: buttonFunction != null ? () => buttonFunction!() : null,
         ),
         const SizedBox(height: Sizes.spaceNormal),
diff --git a/lib/features/settings/subfeatures/dapp_hooks/dapp_hooks_page.dart b/lib/features/settings/subfeatures/dapp_hooks/dapp_hooks_page.dart
index d3393042..deb774a0 100644
--- a/lib/features/settings/subfeatures/dapp_hooks/dapp_hooks_page.dart
+++ b/lib/features/settings/subfeatures/dapp_hooks/dapp_hooks_page.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/features/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
diff --git a/lib/features/settings/subfeatures/dapp_hooks/dapp_hooks_presenter.dart b/lib/features/settings/subfeatures/dapp_hooks/dapp_hooks_presenter.dart
index 90e83528..f6ac256e 100644
--- a/lib/features/settings/subfeatures/dapp_hooks/dapp_hooks_presenter.dart
+++ b/lib/features/settings/subfeatures/dapp_hooks/dapp_hooks_presenter.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
-import 'package:datadashwallet/features/settings/subfeatures/dapp_hooks/utils/utils.dart';
-import 'package:datadashwallet/features/settings/subfeatures/dapp_hooks/utils/wifi_hooks_helper.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/dapp_hooks/utils/utils.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/dapp_hooks/utils/wifi_hooks_helper.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:flutter/material.dart';
 import 'package:geolocator/geolocator.dart' as geo;
 import 'package:mxc_logic/mxc_logic.dart';
diff --git a/lib/features/settings/subfeatures/dapp_hooks/domain/dapp_hooks_repository.dart b/lib/features/settings/subfeatures/dapp_hooks/domain/dapp_hooks_repository.dart
index 63d549aa..2202503f 100644
--- a/lib/features/settings/subfeatures/dapp_hooks/domain/dapp_hooks_repository.dart
+++ b/lib/features/settings/subfeatures/dapp_hooks/domain/dapp_hooks_repository.dart
@@ -1,5 +1,5 @@
 import 'package:mxc_logic/mxc_logic.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 
 class DAppHooksRepository extends ControlledCacheRepository {
   @override
diff --git a/lib/features/settings/subfeatures/dapp_hooks/domain/dapp_hooks_use_case.dart b/lib/features/settings/subfeatures/dapp_hooks/domain/dapp_hooks_use_case.dart
index dcd09e8d..eb7db412 100644
--- a/lib/features/settings/subfeatures/dapp_hooks/domain/dapp_hooks_use_case.dart
+++ b/lib/features/settings/subfeatures/dapp_hooks/domain/dapp_hooks_use_case.dart
@@ -1,11 +1,11 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
-import 'package:datadashwallet/app/app.dart';
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/common/common.dart';
-import 'package:datadashwallet/features/settings/subfeatures/chain_configuration/domain/chain_configuration_use_case.dart';
+import 'package:moonchain_wallet/app/app.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/chain_configuration/domain/chain_configuration_use_case.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:h3_flutter/h3_flutter.dart';
@@ -241,7 +241,7 @@ class DAppHooksUseCase extends ReactiveUseCase {
           amount: MxcAmount.zero(),
           nonce: nonce,
         );
-        AXSNotification().showNotification(
+        MoonchainWalletNotification().showNotification(
           cTranslate('wifi_info_notifications_title'),
           cTranslate('wifi_info_notifications_text'),
         );
@@ -267,10 +267,10 @@ class DAppHooksUseCase extends ReactiveUseCase {
         foregroundNotificationConfig: geo.ForegroundNotificationConfig(
           notificationText: FlutterI18n.translate(
               appNavigatorKey.currentContext!,
-              'axs_background_location_service_text'),
+              'moonchain_background_location_service_text'),
           notificationTitle: FlutterI18n.translate(
               appNavigatorKey.currentContext!,
-              'axs_background_location_service_title'),
+              'moonchain_background_location_service_title'),
           enableWakeLock: true,
           notificationIcon: const geo.AndroidResource(
             name: 'axs_logo',
@@ -389,7 +389,7 @@ class DAppHooksUseCase extends ReactiveUseCase {
       int delay, String taskId) async {
     try {
       final result =
-          await AXSBackgroundFetch.startBackgroundProcess(taskId: taskId);
+          await MXCWalletBackgroundFetch.startBackgroundProcess(taskId: taskId);
 
       if (!result) return result;
 
@@ -415,7 +415,7 @@ class DAppHooksUseCase extends ReactiveUseCase {
   Future<bool> startOneTimeBackgroundService(int delay, String taskId) async {
     try {
       final result =
-          await AXSBackgroundFetch.startBackgroundProcess(taskId: taskId);
+          await MXCWalletBackgroundFetch.startBackgroundProcess(taskId: taskId);
 
       if (!result) return result;
 
@@ -449,17 +449,17 @@ class DAppHooksUseCase extends ReactiveUseCase {
   }
 
   Future<int> stopBlueberryAutoSyncService({required bool turnOffAll}) async {
-    return await AXSBackgroundFetch.stopServices(
+    return await MXCWalletBackgroundFetch.stopServices(
         taskId: blueberryAutoSyncTask, turnOffAll: turnOffAll);
   }
 
   Future<int> stopMinerAutoClaimService({required bool turnOffAll}) async {
-    return await AXSBackgroundFetch.stopServices(
+    return await MXCWalletBackgroundFetch.stopServices(
         taskId: minerAutoClaimTaskTaskId, turnOffAll: turnOffAll);
   }
 
   Future<int> stopWifiHooksService({required bool turnOffAll}) async {
-    return await AXSBackgroundFetch.stopServices(
+    return await MXCWalletBackgroundFetch.stopServices(
         taskId: wifiHookTasksTaskId, turnOffAll: turnOffAll);
   }
 
@@ -475,11 +475,11 @@ class DAppHooksUseCase extends ReactiveUseCase {
       required Account account,
       required DateTime minerAutoClaimTime}) async {
     try {
-      AXSNotification()
+      MoonchainWalletNotification()
           .showNotification(cTranslate('auto_claim_started'), null);
 
       if (selectedMinerListId.isEmpty) {
-        AXSNotification().showNotification(
+        MoonchainWalletNotification().showNotification(
           cTranslate('no_miners_selected_notification_title'),
           cTranslate('no_miners_selected_notification_text'),
         );
@@ -487,16 +487,17 @@ class DAppHooksUseCase extends ReactiveUseCase {
         final ableToClaim = await _minerUseCase.claimMinersReward(
             selectedMinerListId: selectedMinerListId,
             account: account,
-            showNotification: AXSNotification().showLowPriorityNotification,
+            showNotification:
+                MoonchainWalletNotification().showLowPriorityNotification,
             translate: cTranslate);
 
         if (ableToClaim) {
-          AXSNotification().showNotification(
+          MoonchainWalletNotification().showNotification(
             cTranslate('auto_claim_successful_notification_title'),
             cTranslate('auto_claim_successful_notification_text'),
           );
         } else {
-          AXSNotification().showNotification(
+          MoonchainWalletNotification().showNotification(
             cTranslate('nothing_to_claim_notification_title'),
             cTranslate('nothing_to_claim_notification_text'),
           );
@@ -516,10 +517,11 @@ class DAppHooksUseCase extends ReactiveUseCase {
       required Account account,
       required DateTime ringAutoSyncTime}) async {
     try {
-      AXSNotification().showNotification(cTranslate('auto_sync_started'), null);
+      MoonchainWalletNotification()
+          .showNotification(cTranslate('auto_sync_started'), null);
 
       if (selectedRingsListId.isEmpty) {
-        AXSNotification().showNotification(
+        MoonchainWalletNotification().showNotification(
           cTranslate('no_rings_selected_notification_title'),
           cTranslate('no_rings_selected_notification_text'),
         );
@@ -527,16 +529,17 @@ class DAppHooksUseCase extends ReactiveUseCase {
         final ableToClaim = await _blueberryRingBackgroundSyncUseCase.syncRings(
             selectedRingsListId: selectedRingsListId,
             account: account,
-            showNotification: AXSNotification().showLowPriorityNotification,
+            showNotification:
+                MoonchainWalletNotification().showLowPriorityNotification,
             translate: cTranslate);
 
         if (ableToClaim) {
-          AXSNotification().showNotification(
+          MoonchainWalletNotification().showNotification(
             cTranslate('auto_sync_successful_notification_title'),
             cTranslate('auto_sync_successful_notification_text'),
           );
         } else {
-          AXSNotification().showNotification(
+          MoonchainWalletNotification().showNotification(
             cTranslate('already_synced_notification_title'),
             cTranslate('already_synced_notification_text'),
           );
diff --git a/lib/features/settings/subfeatures/dapp_hooks/utils/blueberry_ring_helper.dart b/lib/features/settings/subfeatures/dapp_hooks/utils/blueberry_ring_helper.dart
index d3bab3ab..0a1d57bf 100644
--- a/lib/features/settings/subfeatures/dapp_hooks/utils/blueberry_ring_helper.dart
+++ b/lib/features/settings/subfeatures/dapp_hooks/utils/blueberry_ring_helper.dart
@@ -1,8 +1,8 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/common/common.dart';
-import 'package:datadashwallet/features/settings/subfeatures/dapp_hooks/utils/utils.dart';
-import 'package:datadashwallet/features/settings/subfeatures/notifications/domain/background_fetch_config_use_case.dart';
-import 'package:datadashwallet/features/settings/subfeatures/notifications/widgets/background_fetch_dialog.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/dapp_hooks/utils/utils.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/notifications/domain/background_fetch_config_use_case.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/notifications/widgets/background_fetch_dialog.dart';
 import 'package:flutter/material.dart';
 import '../domain/dapp_hooks_use_case.dart';
 
@@ -56,7 +56,7 @@ class BlueberryHooksHelper {
     final periodicalCallData =
         backgroundFetchConfigUseCase.periodicalCallData.value;
     final turnOffAll =
-        AXSBackgroundFetch.turnOffAll(dappHooksData, periodicalCallData);
+        MXCWalletBackgroundFetch.turnOffAll(dappHooksData, periodicalCallData);
 
     await dAppHooksUseCase.stopBlueberryAutoSyncService(turnOffAll: turnOffAll);
     if (showSnackbar) {
diff --git a/lib/features/settings/subfeatures/dapp_hooks/utils/dapp_hooks_helper.dart b/lib/features/settings/subfeatures/dapp_hooks/utils/dapp_hooks_helper.dart
index 74439cb1..db07feb8 100644
--- a/lib/features/settings/subfeatures/dapp_hooks/utils/dapp_hooks_helper.dart
+++ b/lib/features/settings/subfeatures/dapp_hooks/utils/dapp_hooks_helper.dart
@@ -1,12 +1,11 @@
-import 'package:datadashwallet/features/settings/subfeatures/dapp_hooks/utils/utils.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/dapp_hooks/utils/utils.dart';
 import 'package:flutter/material.dart';
 
 import '../dapp_hooks_state.dart';
+
 class DAppHooksHelper {
   DAppHooksHelper(
-      {required this.state,
-      required this.context,
-      required this.translate});
+      {required this.state, required this.context, required this.translate});
 
   DAppHooksState state;
   DappHooksSnackBarUtils get dappHooksSnackBarUtils =>
diff --git a/lib/features/settings/subfeatures/dapp_hooks/utils/miner_hooks_helper.dart b/lib/features/settings/subfeatures/dapp_hooks/utils/miner_hooks_helper.dart
index 907ed553..1b54ca5e 100644
--- a/lib/features/settings/subfeatures/dapp_hooks/utils/miner_hooks_helper.dart
+++ b/lib/features/settings/subfeatures/dapp_hooks/utils/miner_hooks_helper.dart
@@ -1,8 +1,8 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/common/common.dart';
-import 'package:datadashwallet/features/settings/subfeatures/dapp_hooks/utils/utils.dart';
-import 'package:datadashwallet/features/settings/subfeatures/notifications/domain/background_fetch_config_use_case.dart';
-import 'package:datadashwallet/features/settings/subfeatures/notifications/widgets/background_fetch_dialog.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/dapp_hooks/utils/utils.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/notifications/domain/background_fetch_config_use_case.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/notifications/widgets/background_fetch_dialog.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import '../domain/dapp_hooks_use_case.dart';
@@ -71,7 +71,7 @@ class MinerHooksHelper {
     final periodicalCallData =
         backgroundFetchConfigUseCase.periodicalCallData.value;
     final turnOffAll =
-        AXSBackgroundFetch.turnOffAll(dappHooksData, periodicalCallData);
+        MXCWalletBackgroundFetch.turnOffAll(dappHooksData, periodicalCallData);
 
     await dAppHooksUseCase.stopMinerAutoClaimService(turnOffAll: turnOffAll);
     if (showSnackbar) {
diff --git a/lib/features/settings/subfeatures/dapp_hooks/utils/snack_bar_utils.dart b/lib/features/settings/subfeatures/dapp_hooks/utils/snack_bar_utils.dart
index e47d2eb3..4b5b796c 100644
--- a/lib/features/settings/subfeatures/dapp_hooks/utils/snack_bar_utils.dart
+++ b/lib/features/settings/subfeatures/dapp_hooks/utils/snack_bar_utils.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 
 class DappHooksSnackBarUtils {
diff --git a/lib/features/settings/subfeatures/dapp_hooks/utils/wifi_hooks_helper.dart b/lib/features/settings/subfeatures/dapp_hooks/utils/wifi_hooks_helper.dart
index 3f0244ea..dcca0bf0 100644
--- a/lib/features/settings/subfeatures/dapp_hooks/utils/wifi_hooks_helper.dart
+++ b/lib/features/settings/subfeatures/dapp_hooks/utils/wifi_hooks_helper.dart
@@ -2,15 +2,15 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:app_settings/app_settings.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/subfeatures/dapp_hooks/utils/utils.dart';
-import 'package:datadashwallet/features/settings/subfeatures/notifications/domain/background_fetch_config_use_case.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/dapp_hooks/utils/utils.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/notifications/domain/background_fetch_config_use_case.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'package:permission_handler/permission_handler.dart';
 import '../dapp_hooks_state.dart';
 import '../domain/dapp_hooks_use_case.dart';
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:geolocator/geolocator.dart' as geo;
 import '../widgets/wifi_hooks_background_fetch_alert_bottom_sheet.dart';
 import '../widgets/location_permission_bottom_sheet.dart';
@@ -113,7 +113,7 @@ class WiFiHooksHelper {
     final periodicalCallData =
         backgroundFetchConfigUseCase.periodicalCallData.value;
     final turnOffAll =
-        AXSBackgroundFetch.turnOffAll(dappHooksData, periodicalCallData);
+        MXCWalletBackgroundFetch.turnOffAll(dappHooksData, periodicalCallData);
     await dAppHooksUseCase.stopWifiHooksService(turnOffAll: turnOffAll);
     if (showSnackbar) {
       dappHooksSnackBarUtils.showWiFiHooksServiceDisableSuccessSnackBar();
diff --git a/lib/features/settings/subfeatures/dapp_hooks/widgets/auto_claim_dialog.dart b/lib/features/settings/subfeatures/dapp_hooks/widgets/auto_claim_dialog.dart
index 317e1526..4edd80e4 100644
--- a/lib/features/settings/subfeatures/dapp_hooks/widgets/auto_claim_dialog.dart
+++ b/lib/features/settings/subfeatures/dapp_hooks/widgets/auto_claim_dialog.dart
@@ -1,3 +1,4 @@
+import 'package:moonchain_wallet/common/bottom_sheets/bottom_sheets.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_ui/mxc_ui.dart';
@@ -6,71 +7,59 @@ Future<bool?> showAutoClaimExecutionAlertDialog(
     {required BuildContext context, required Function executeAutoClaim}) async {
   String translate(String text) => FlutterI18n.translate(context, text);
 
-  return showModalBottomSheet<bool>(
+  return showBaseBottomSheet<bool>(
     context: context,
-    useRootNavigator: true,
-    isScrollControlled: true,
-    backgroundColor: Colors.transparent,
-    useSafeArea: true,
-    builder: (BuildContext context) => Container(
-      padding: const EdgeInsets.only(
-          top: Sizes.spaceNormal, bottom: Sizes.space3XLarge),
-      decoration: BoxDecoration(
-        color: ColorsTheme.of(context).layerSheetBackground,
-        borderRadius: const BorderRadius.only(
-          topLeft: Radius.circular(20),
-          topRight: Radius.circular(20),
+    content: Column(
+      mainAxisSize: MainAxisSize.min,
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        MxcAppBarEvenly.title(
+          titleText: translate('auto_claim_execution_dialog_title'),
+          useContentPadding: false,
+          textFieldFlex: 5,
         ),
-      ),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          MxcAppBarEvenly.title(
-            titleText: translate('auto_claim_execution_dialog_title'),
-            useContentPadding: false,
-            textFieldFlex: 5,
+        Padding(
+          padding: const EdgeInsetsDirectional.symmetric(
+            horizontal: Sizes.spaceXLarge,
           ),
-          Padding(
-            padding: const EdgeInsetsDirectional.symmetric(
-              horizontal: Sizes.spaceXLarge,
-            ),
-            child: Column(
-              children: [
-                Text(
-                  translate(
-                    'auto_claim_execution_dialog_text',
-                  ),
-                  style: FontTheme.of(context).body1.primary().copyWith(),
-                  softWrap: true,
-                  textAlign: TextAlign.justify,
+          child: Column(
+            children: [
+              Text(
+                translate(
+                  'auto_claim_execution_dialog_text',
                 ),
-                const SizedBox(
-                  height: Sizes.spaceNormal,
-                ),
-                MxcButton.secondary(
-                  key: const ValueKey('cancelButton'),
-                  title: translate('cancel'),
-                  onTap: () => Navigator.of(context).pop(false),
-                  size: AxsButtonSize.xl,
-                ),
-                const SizedBox(
-                  height: Sizes.spaceNormal,
-                ),
-                MxcButton.primary(
-                  key: const ValueKey('executeButton'),
-                  title: translate('execute'),
-                  onTap: () {
-                    executeAutoClaim();
-                    Navigator.of(context).pop(true);
-                  },
-                  size: AxsButtonSize.xl,
-                ),
-              ],
-            ),
-          )
-        ],
-      ),
+                style: FontTheme.of(context, listen: false)
+                    .body1
+                    .primary()
+                    .copyWith(),
+                softWrap: true,
+                textAlign: TextAlign.justify,
+              ),
+              const SizedBox(
+                height: Sizes.spaceNormal,
+              ),
+              MxcButton.secondary(
+                key: const ValueKey('cancelButton'),
+                title: translate('cancel'),
+                onTap: () => Navigator.of(context).pop(false),
+                size: MXCWalletButtonSize.xl,
+              ),
+              const SizedBox(
+                height: Sizes.spaceNormal,
+              ),
+              MxcButton.primary(
+                key: const ValueKey('executeButton'),
+                title: translate('execute'),
+                onTap: () {
+                  executeAutoClaim();
+                  Navigator.of(context).pop(true);
+                },
+                size: MXCWalletButtonSize.xl,
+              ),
+            ],
+          ),
+        )
+      ],
     ),
   );
 }
diff --git a/lib/features/settings/subfeatures/dapp_hooks/widgets/location_permission_bottom_sheet.dart b/lib/features/settings/subfeatures/dapp_hooks/widgets/location_permission_bottom_sheet.dart
index 2bf0ff32..9ec80224 100644
--- a/lib/features/settings/subfeatures/dapp_hooks/widgets/location_permission_bottom_sheet.dart
+++ b/lib/features/settings/subfeatures/dapp_hooks/widgets/location_permission_bottom_sheet.dart
@@ -1,3 +1,4 @@
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_ui/mxc_ui.dart';
@@ -8,73 +9,61 @@ Future<bool?> showLocationPermissionBottomSheet({
 }) async {
   String translate(String text) => FlutterI18n.translate(context, text);
 
-  return showModalBottomSheet<bool>(
+  return showBaseBottomSheet<bool>(
     context: context,
-    useRootNavigator: true,
-    isScrollControlled: true,
-    backgroundColor: Colors.transparent,
-    useSafeArea: true,
-    builder: (BuildContext context) => Container(
-      padding: const EdgeInsets.only(
-          top: Sizes.spaceNormal, bottom: Sizes.space3XLarge),
-      decoration: BoxDecoration(
-        color: ColorsTheme.of(context).layerSheetBackground,
-        borderRadius: const BorderRadius.only(
-          topLeft: Radius.circular(20),
-          topRight: Radius.circular(20),
+    content: Column(
+      mainAxisSize: MainAxisSize.min,
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        MxcAppBarEvenly.title(
+          titleText: translate('location_permission_required_title'),
+          useContentPadding: false,
+          textFieldFlex: 5,
         ),
-      ),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          MxcAppBarEvenly.title(
-            titleText: translate('location_permission_required_title'),
-            useContentPadding: false,
-            textFieldFlex: 5,
+        Padding(
+          padding: const EdgeInsetsDirectional.symmetric(
+            horizontal: Sizes.spaceXLarge,
           ),
-          Padding(
-            padding: const EdgeInsetsDirectional.symmetric(
-              horizontal: Sizes.spaceXLarge,
-            ),
-            child: Column(
-              children: [
-                Text(
-                  translate(
-                    'location_permission_required_text',
-                  ),
-                  style: FontTheme.of(context).body1.primary().copyWith(),
-                  softWrap: true,
-                  textAlign: TextAlign.justify,
+          child: Column(
+            children: [
+              Text(
+                translate(
+                  'location_permission_required_text',
                 ),
-                const SizedBox(
-                  height: Sizes.spaceNormal,
-                ),
-                MxcButton.primary(
-                  key: const ValueKey('openLocationSettingsButton'),
-                  title: translate('open_settings'),
-                  onTap: () {
-                    openLocationSettings();
-                    Navigator.of(context).pop(true);
-                  },
-                  size: AxsButtonSize.xl,
-                ),
-                const SizedBox(
-                  height: Sizes.spaceNormal,
-                ),
-                MxcButton.secondary(
-                  key: const ValueKey('cancelButton'),
-                  title: translate('cancel'),
-                  onTap: () {
-                    Navigator.of(context).pop(true);
-                  },
-                  size: AxsButtonSize.xl,
-                ),
-              ],
-            ),
-          )
-        ],
-      ),
+                style: FontTheme.of(context, listen: false)
+                    .body1
+                    .primary()
+                    .copyWith(),
+                softWrap: true,
+                textAlign: TextAlign.justify,
+              ),
+              const SizedBox(
+                height: Sizes.spaceNormal,
+              ),
+              MxcButton.primary(
+                key: const ValueKey('openLocationSettingsButton'),
+                title: translate('open_settings'),
+                onTap: () {
+                  openLocationSettings();
+                  Navigator.of(context).pop(true);
+                },
+                size: MXCWalletButtonSize.xl,
+              ),
+              const SizedBox(
+                height: Sizes.spaceNormal,
+              ),
+              MxcButton.secondary(
+                key: const ValueKey('cancelButton'),
+                title: translate('cancel'),
+                onTap: () {
+                  Navigator.of(context).pop(true);
+                },
+                size: MXCWalletButtonSize.xl,
+              ),
+            ],
+          ),
+        )
+      ],
     ),
   );
 }
diff --git a/lib/features/settings/subfeatures/dapp_hooks/widgets/wifi_hooks_background_fetch_alert_bottom_sheet.dart b/lib/features/settings/subfeatures/dapp_hooks/widgets/wifi_hooks_background_fetch_alert_bottom_sheet.dart
index 0ee9a5b9..fb32c49e 100644
--- a/lib/features/settings/subfeatures/dapp_hooks/widgets/wifi_hooks_background_fetch_alert_bottom_sheet.dart
+++ b/lib/features/settings/subfeatures/dapp_hooks/widgets/wifi_hooks_background_fetch_alert_bottom_sheet.dart
@@ -1,3 +1,4 @@
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_ui/mxc_ui.dart';
@@ -7,61 +8,49 @@ Future<bool?> showWiFiHooksBackgroundFetchAlertBottomSheet({
 }) async {
   String translate(String text) => FlutterI18n.translate(context, text);
 
-  return showModalBottomSheet<bool>(
+  return showBaseBottomSheet<bool>(
     context: context,
-    useRootNavigator: true,
-    isScrollControlled: true,
-    backgroundColor: Colors.transparent,
-    useSafeArea: true,
-    builder: (BuildContext context) => Container(
-      padding: const EdgeInsets.only(
-          top: Sizes.spaceNormal, bottom: Sizes.space3XLarge),
-      decoration: BoxDecoration(
-        color: ColorsTheme.of(context).layerSheetBackground,
-        borderRadius: const BorderRadius.only(
-          topLeft: Radius.circular(20),
-          topRight: Radius.circular(20),
+    content: Column(
+      mainAxisSize: MainAxisSize.min,
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        MxcAppBarEvenly.title(
+          titleText: translate('background_fetch_notice_title'),
+          useContentPadding: false,
+          textFieldFlex: 5,
         ),
-      ),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          MxcAppBarEvenly.title(
-            titleText: translate('background_fetch_notice_title'),
-            useContentPadding: false,
-            textFieldFlex: 5,
+        Padding(
+          padding: const EdgeInsetsDirectional.symmetric(
+            horizontal: Sizes.spaceXLarge,
           ),
-          Padding(
-            padding: const EdgeInsetsDirectional.symmetric(
-              horizontal: Sizes.spaceXLarge,
-            ),
-            child: Column(
-              children: [
-                Text(
-                  translate(
-                    'wifi_location_background_fetch_notice_text',
-                  ),
-                  style: FontTheme.of(context).body1.primary().copyWith(),
-                  softWrap: true,
-                  textAlign: TextAlign.justify,
+          child: Column(
+            children: [
+              Text(
+                translate(
+                  'wifi_location_background_fetch_notice_text',
                 ),
-                const SizedBox(
-                  height: Sizes.spaceNormal,
-                ),
-                MxcButton.primary(
-                  key: const ValueKey('acknowledgeButton'),
-                  title: translate('acknowledge'),
-                  onTap: () {
-                    Navigator.of(context).pop(true);
-                  },
-                  size: AxsButtonSize.xl,
-                ),
-              ],
-            ),
-          )
-        ],
-      ),
+                style: FontTheme.of(context, listen: false)
+                    .body1
+                    .primary()
+                    .copyWith(),
+                softWrap: true,
+                textAlign: TextAlign.justify,
+              ),
+              const SizedBox(
+                height: Sizes.spaceNormal,
+              ),
+              MxcButton.primary(
+                key: const ValueKey('acknowledgeButton'),
+                title: translate('acknowledge'),
+                onTap: () {
+                  Navigator.of(context).pop(true);
+                },
+                size: MXCWalletButtonSize.xl,
+              ),
+            ],
+          ),
+        )
+      ],
     ),
   );
 }
diff --git a/lib/features/settings/subfeatures/dapp_hooks/widgets/wifi_hooks_frequency_bottom_sheet.dart b/lib/features/settings/subfeatures/dapp_hooks/widgets/wifi_hooks_frequency_bottom_sheet.dart
index b4efa98c..3ebbccb6 100644
--- a/lib/features/settings/subfeatures/dapp_hooks/widgets/wifi_hooks_frequency_bottom_sheet.dart
+++ b/lib/features/settings/subfeatures/dapp_hooks/widgets/wifi_hooks_frequency_bottom_sheet.dart
@@ -1,3 +1,4 @@
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_logic/mxc_logic.dart';
@@ -8,85 +9,73 @@ Future<bool?> showWiFiHooksFrequencyBottomSheet(BuildContext context,
     required PeriodicalCallDuration selectedFrequency}) {
   String translate(String text) => FlutterI18n.translate(context, text);
 
-  return showModalBottomSheet<bool>(
+  return showBaseBottomSheet<bool>(
     context: context,
-    useRootNavigator: true,
-    isScrollControlled: true,
-    useSafeArea: true,
-    backgroundColor: Colors.transparent,
-    builder: (BuildContext context) => Container(
-      padding: const EdgeInsets.only(
-          top: Sizes.spaceNormal, bottom: Sizes.space3XLarge),
-      decoration: BoxDecoration(
-        color: ColorsTheme.of(context).layerSheetBackground,
-        borderRadius: const BorderRadius.only(
-          topLeft: Radius.circular(20),
-          topRight: Radius.circular(20),
-        ),
-      ),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          Padding(
-            padding: const EdgeInsetsDirectional.only(
-                start: Sizes.spaceNormal,
-                end: Sizes.spaceNormal,
-                bottom: Sizes.space2XLarge),
-            child: MxcAppBarEvenly.title(
-              titleText: translate('select_x')
-                  .replaceFirst('{0}', translate('frequency').toLowerCase()),
-              action: Container(
-                alignment: Alignment.centerRight,
-                child: InkWell(
-                  child: Icon(
-                    MxcIcons.close,
-                    size: 32,
-                    color: ColorsTheme.of(context).iconPrimary,
-                  ),
-                  onTap: () => Navigator.of(context).pop(false),
+    content: Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Padding(
+          padding: const EdgeInsetsDirectional.only(
+              start: Sizes.spaceNormal,
+              end: Sizes.spaceNormal,
+              bottom: Sizes.space2XLarge),
+          child: MxcAppBarEvenly.title(
+            titleText: translate('select_x')
+                .replaceFirst('{0}', translate('frequency').toLowerCase()),
+            action: Container(
+              alignment: Alignment.centerRight,
+              child: InkWell(
+                child: Icon(
+                  MxcIcons.close,
+                  size: 32,
+                  color: ColorsTheme.of(context, listen: false).iconPrimary,
                 ),
+                onTap: () => Navigator.of(context).pop(false),
               ),
             ),
           ),
-          ...PeriodicalCallDuration.values
-              .map((e) => InkWell(
-                    onTap: () {
-                      onTap(e);
-                      Navigator.of(context).pop(false);
-                    },
-                    child: Row(
-                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      children: [
-                        Flexible(
-                          child: Container(
-                            padding: const EdgeInsets.symmetric(
-                                horizontal: Sizes.spaceXLarge,
-                                vertical: Sizes.spaceSmall),
-                            alignment: AlignmentDirectional.centerStart,
-                            child: Text(
-                              e.toStringFormatted(),
-                              style: FontTheme.of(context).body2.primary(),
-                              softWrap: true,
-                              overflow: TextOverflow.ellipsis,
-                            ),
+        ),
+        ...PeriodicalCallDuration.values
+            .map((e) => InkWell(
+                  onTap: () {
+                    onTap(e);
+                    Navigator.of(context).pop(false);
+                  },
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Flexible(
+                        child: Container(
+                          padding: const EdgeInsets.symmetric(
+                              horizontal: Sizes.spaceXLarge,
+                              vertical: Sizes.spaceSmall),
+                          alignment: AlignmentDirectional.centerStart,
+                          child: Text(
+                            e.toStringFormatted(),
+                            style: FontTheme.of(context, listen: false)
+                                .body2
+                                .primary(),
+                            softWrap: true,
+                            overflow: TextOverflow.ellipsis,
                           ),
                         ),
-                        if (selectedFrequency == e)
-                          Padding(
-                            padding: const EdgeInsets.symmetric(
-                                horizontal: Sizes.spaceNormal),
-                            child: Icon(
-                              MxcIcons.check,
-                              size: 24,
-                              color: ColorsTheme.of(context).white400,
-                            ),
+                      ),
+                      if (selectedFrequency == e)
+                        Padding(
+                          padding: const EdgeInsets.symmetric(
+                              horizontal: Sizes.spaceNormal),
+                          child: Icon(
+                            MxcIcons.check,
+                            size: 24,
+                            color:
+                                ColorsTheme.of(context, listen: false).white400,
                           ),
-                      ],
-                    ),
-                  ))
-              .toList(),
-        ],
-      ),
+                        ),
+                    ],
+                  ),
+                ))
+            .toList(),
+      ],
     ),
   );
 }
diff --git a/lib/features/settings/subfeatures/language/domain/language_repository.dart b/lib/features/settings/subfeatures/language/domain/language_repository.dart
index a5151a3b..17960beb 100644
--- a/lib/features/settings/subfeatures/language/domain/language_repository.dart
+++ b/lib/features/settings/subfeatures/language/domain/language_repository.dart
@@ -1,5 +1,5 @@
 import 'package:mxc_logic/mxc_logic.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 
 class LanguageRepository extends GlobalCacheRepository {
   final List<Language> supportedLocales = const [
diff --git a/lib/features/settings/subfeatures/language/domain/language_use_case.dart b/lib/features/settings/subfeatures/language/domain/language_use_case.dart
index 4ac9d583..c79413c8 100644
--- a/lib/features/settings/subfeatures/language/domain/language_use_case.dart
+++ b/lib/features/settings/subfeatures/language/domain/language_use_case.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 
 import 'language_repository.dart';
 
diff --git a/lib/features/settings/subfeatures/language/presentation/language/language_presenter.dart b/lib/features/settings/subfeatures/language/presentation/language/language_presenter.dart
index 900dd4c9..19d2c217 100644
--- a/lib/features/settings/subfeatures/language/presentation/language/language_presenter.dart
+++ b/lib/features/settings/subfeatures/language/presentation/language/language_presenter.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/settings.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/settings.dart';
 import 'package:flutter/material.dart';
 
 import 'language_state.dart';
diff --git a/lib/features/settings/subfeatures/language/presentation/language/language_state.dart b/lib/features/settings/subfeatures/language/presentation/language/language_state.dart
index be5cda1a..77cf14dc 100644
--- a/lib/features/settings/subfeatures/language/presentation/language/language_state.dart
+++ b/lib/features/settings/subfeatures/language/presentation/language/language_state.dart
@@ -1,5 +1,5 @@
 import 'package:equatable/equatable.dart';
-import 'package:datadashwallet/features/settings/settings.dart';
+import 'package:moonchain_wallet/features/settings/settings.dart';
 
 class LanguageState with EquatableMixin {
   late final List<Language> supportedLanguages;
diff --git a/lib/features/settings/subfeatures/language/presentation/language_page/language_page.dart b/lib/features/settings/subfeatures/language/presentation/language_page/language_page.dart
index cffa4893..91b62779 100644
--- a/lib/features/settings/subfeatures/language/presentation/language_page/language_page.dart
+++ b/lib/features/settings/subfeatures/language/presentation/language_page/language_page.dart
@@ -1,6 +1,6 @@
 import 'package:collection/collection.dart';
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/features/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -42,7 +42,7 @@ class LanguagePage extends ConsumerWidget {
                     children: [
                       Text(
                         FlutterI18n.translate(context, language.nativeName),
-                        style: FontTheme.of(context).body1(),
+                        style: FontTheme.of(context).body2(),
                       ),
                       if (selectedLanguage == language) ...[
                         const Icon(Icons.check_rounded),
diff --git a/lib/features/settings/subfeatures/language/presentation/language_page/language_presenter.dart b/lib/features/settings/subfeatures/language/presentation/language_page/language_presenter.dart
index 9d69aeef..7acfd446 100644
--- a/lib/features/settings/subfeatures/language/presentation/language_page/language_presenter.dart
+++ b/lib/features/settings/subfeatures/language/presentation/language_page/language_presenter.dart
@@ -1,7 +1,7 @@
 import 'dart:ui';
 
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/settings.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/settings.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 
 import 'language_state.dart';
diff --git a/lib/features/settings/subfeatures/language/presentation/language_page/language_state.dart b/lib/features/settings/subfeatures/language/presentation/language_page/language_state.dart
index 885d8af3..368ffcf8 100644
--- a/lib/features/settings/subfeatures/language/presentation/language_page/language_state.dart
+++ b/lib/features/settings/subfeatures/language/presentation/language_page/language_state.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/features/settings/settings.dart';
+import 'package:moonchain_wallet/features/settings/settings.dart';
 import 'package:equatable/equatable.dart';
 
 class LanguageState with EquatableMixin {
diff --git a/lib/features/settings/subfeatures/language/presentation/language_presentation_ext.dart b/lib/features/settings/subfeatures/language/presentation/language_presentation_ext.dart
index 6f2fcda8..7ccaf4b7 100644
--- a/lib/features/settings/subfeatures/language/presentation/language_presentation_ext.dart
+++ b/lib/features/settings/subfeatures/language/presentation/language_presentation_ext.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:datadashwallet/features/settings/settings.dart';
+import 'package:moonchain_wallet/features/settings/settings.dart';
 
 extension LanguageExt on Language {
   Locale toLocale() {
diff --git a/lib/features/settings/subfeatures/notifications/domain/background_fetch_config_repository.dart b/lib/features/settings/subfeatures/notifications/domain/background_fetch_config_repository.dart
index 50011c1f..dcc88b44 100644
--- a/lib/features/settings/subfeatures/notifications/domain/background_fetch_config_repository.dart
+++ b/lib/features/settings/subfeatures/notifications/domain/background_fetch_config_repository.dart
@@ -1,5 +1,5 @@
 import 'package:mxc_logic/mxc_logic.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 
 class BackgroundFetchConfigRepository extends ControlledCacheRepository {
   @override
diff --git a/lib/features/settings/subfeatures/notifications/domain/background_fetch_config_use_case.dart b/lib/features/settings/subfeatures/notifications/domain/background_fetch_config_use_case.dart
index 583dfa92..dae3a359 100644
--- a/lib/features/settings/subfeatures/notifications/domain/background_fetch_config_use_case.dart
+++ b/lib/features/settings/subfeatures/notifications/domain/background_fetch_config_use_case.dart
@@ -1,8 +1,8 @@
 import 'dart:io';
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/common/common.dart';
-import 'package:datadashwallet/features/settings/subfeatures/chain_configuration/domain/chain_configuration_use_case.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/chain_configuration/domain/chain_configuration_use_case.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'package:background_fetch/background_fetch.dart' as bgFetch;
 
@@ -135,7 +135,7 @@ class BackgroundFetchConfigUseCase extends ReactiveUseCase {
     final balanceDouble = balance.getInEther.toDouble();
     print("lowBalanceLimitEnabled $balanceDouble $lowBalanceLimit");
     if (balanceDouble < lowBalanceLimit) {
-      AXSNotification().showNotification(
+      MoonchainWalletNotification().showNotification(
         cTranslate('low_balance_notification_title'),
         cTranslate('low_balance_notification_text')
             .replaceFirst('{0}', balanceDouble.toString())
@@ -156,7 +156,7 @@ class BackgroundFetchConfigUseCase extends ReactiveUseCase {
     print(
         "expectedTransactionFeeEnabled $transactionFee $expectedTransactionFee");
     if (transactionFee < expectedTransactionFee) {
-      AXSNotification().showNotification(
+      MoonchainWalletNotification().showNotification(
         cTranslate('tx_fee_reached_expectation_notification_title'),
         cTranslate('tx_fee_reached_expectation_notification_text')
             .replaceFirst('{0}', transactionFee.toString())
@@ -185,7 +185,7 @@ class BackgroundFetchConfigUseCase extends ReactiveUseCase {
 
     if (expectedEpochOccurrence <= epochQuantity) {
       periodicalCallData = periodicalCallData.copyWith(lasEpoch: epochNumber);
-      AXSNotification().showNotification(
+      MoonchainWalletNotification().showNotification(
           cTranslate('epoch_occur_notification_title'),
           cTranslate('epoch_occur_notification_text'));
     }
@@ -232,7 +232,7 @@ class BackgroundFetchConfigUseCase extends ReactiveUseCase {
   ) async {
     try {
       final result =
-          await AXSBackgroundFetch.startBackgroundProcess(taskId: taskId);
+          await MXCWalletBackgroundFetch.startBackgroundProcess(taskId: taskId);
 
       if (!result) return result;
 
@@ -247,7 +247,6 @@ class BackgroundFetchConfigUseCase extends ReactiveUseCase {
         enableHeadless: true,
         forceAlarmManager: false,
         requiredNetworkType: bgFetch.NetworkType.ANY,
-        
       ));
 
       return scheduleState;
@@ -257,7 +256,7 @@ class BackgroundFetchConfigUseCase extends ReactiveUseCase {
   }
 
   Future<int> stopNotificationsService({required bool turnOffAll}) async {
-    return await AXSBackgroundFetch.stopServices(
+    return await MXCWalletBackgroundFetch.stopServices(
         taskId: taskId, turnOffAll: turnOffAll);
   }
 }
diff --git a/lib/features/settings/subfeatures/notifications/helpers/notifications_helper.dart b/lib/features/settings/subfeatures/notifications/helpers/notifications_helper.dart
index 8b510024..ca290483 100644
--- a/lib/features/settings/subfeatures/notifications/helpers/notifications_helper.dart
+++ b/lib/features/settings/subfeatures/notifications/helpers/notifications_helper.dart
@@ -1,12 +1,12 @@
 import 'dart:io';
-
+// import 'package:moonchain_wallet';
 import 'package:app_settings/app_settings.dart';
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/common/common.dart';
-import 'package:datadashwallet/features/settings/subfeatures/dapp_hooks/domain/dapp_hooks_use_case.dart';
-import 'package:datadashwallet/features/settings/subfeatures/notifications/domain/background_fetch_config_use_case.dart';
-import 'package:datadashwallet/features/settings/subfeatures/notifications/notifications_state.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/dapp_hooks/domain/dapp_hooks_use_case.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/notifications/domain/background_fetch_config_use_case.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/notifications/notifications_state.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
@@ -123,7 +123,7 @@ class NotificationsHelper {
     final dappHooksData = dAppHooksUseCase.dappHooksData.value;
     final periodicalCallData = state.periodicalCallData;
     final turnOffAll =
-        AXSBackgroundFetch.turnOffAll(dappHooksData, periodicalCallData!);
+        MXCWalletBackgroundFetch.turnOffAll(dappHooksData, periodicalCallData!);
     await backgroundFetchConfigUseCase.stopNotificationsService(
         turnOffAll: turnOffAll);
     if (showSnackbar) {
@@ -147,8 +147,8 @@ class NotificationsHelper {
   void checkNotificationsStatus() async {
     final isGranted = await PermissionUtils.checkNotificationPermission();
     if (state.isNotificationsEnabled == false && isGranted == true) {
-      await AXSFireBase.initializeFirebase();
-      AXSFireBase.initLocalNotificationsAndListeners();
+      await MoonchainWalletFireBase.initializeFirebase();
+      MoonchainWalletFireBase.initLocalNotificationsAndListeners();
     }
     notify(() => state.isNotificationsEnabled = isGranted);
   }
diff --git a/lib/features/settings/subfeatures/notifications/helpers/snack_bar_utils.dart b/lib/features/settings/subfeatures/notifications/helpers/snack_bar_utils.dart
index f6cacb88..1a77c97a 100644
--- a/lib/features/settings/subfeatures/notifications/helpers/snack_bar_utils.dart
+++ b/lib/features/settings/subfeatures/notifications/helpers/snack_bar_utils.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 
 class NotificationsHooksSnackBarUtils {
@@ -29,5 +29,4 @@ class NotificationsHooksSnackBarUtils {
         content: translate('service_disabled_successfully')!
             .replaceAll('{0}', translate('background_notifications')!));
   }
-
 }
diff --git a/lib/features/settings/subfeatures/notifications/notificaitons_page.dart b/lib/features/settings/subfeatures/notifications/notificaitons_page.dart
index dbc3f776..7c6460b6 100644
--- a/lib/features/settings/subfeatures/notifications/notificaitons_page.dart
+++ b/lib/features/settings/subfeatures/notifications/notificaitons_page.dart
@@ -1,6 +1,6 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/features/common/common.dart';
-import 'package:datadashwallet/features/settings/subfeatures/notifications/widgets/epoch_occur_dialog.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/notifications/widgets/epoch_occur_dialog.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
diff --git a/lib/features/settings/subfeatures/notifications/notifications_presenter.dart b/lib/features/settings/subfeatures/notifications/notifications_presenter.dart
index babc3d39..b477e542 100644
--- a/lib/features/settings/subfeatures/notifications/notifications_presenter.dart
+++ b/lib/features/settings/subfeatures/notifications/notifications_presenter.dart
@@ -1,6 +1,6 @@
-import 'package:datadashwallet/common/components/snack_bar.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/cupertino.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'helpers/notifications_helper.dart';
 import 'notifications_state.dart';
diff --git a/lib/features/settings/subfeatures/notifications/widgets/background_fetch_dialog.dart b/lib/features/settings/subfeatures/notifications/widgets/background_fetch_dialog.dart
index a8143415..bbdf7d4e 100644
--- a/lib/features/settings/subfeatures/notifications/widgets/background_fetch_dialog.dart
+++ b/lib/features/settings/subfeatures/notifications/widgets/background_fetch_dialog.dart
@@ -1,3 +1,4 @@
+import 'package:moonchain_wallet/common/bottom_sheets/bottom_sheets.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_ui/mxc_ui.dart';
@@ -7,61 +8,49 @@ Future<bool?> showBackgroundFetchAlertDialog({
 }) async {
   String translate(String text) => FlutterI18n.translate(context, text);
 
-  return showModalBottomSheet<bool>(
+  return showBaseBottomSheet<bool>(
     context: context,
-    useRootNavigator: true,
-    isScrollControlled: true,
-    backgroundColor: Colors.transparent,
-    useSafeArea: true,
-    builder: (BuildContext context) => Container(
-      padding: const EdgeInsets.only(
-          top: Sizes.spaceNormal, bottom: Sizes.space3XLarge),
-      decoration: BoxDecoration(
-        color: ColorsTheme.of(context).layerSheetBackground,
-        borderRadius: const BorderRadius.only(
-          topLeft: Radius.circular(20),
-          topRight: Radius.circular(20),
+    content: Column(
+      mainAxisSize: MainAxisSize.min,
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        MxcAppBarEvenly.title(
+          titleText: translate('background_fetch_notice_title'),
+          useContentPadding: false,
+          textFieldFlex: 5,
         ),
-      ),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          MxcAppBarEvenly.title(
-            titleText: translate('background_fetch_notice_title'),
-            useContentPadding: false,
-            textFieldFlex: 5,
+        Padding(
+          padding: const EdgeInsetsDirectional.symmetric(
+            horizontal: Sizes.spaceXLarge,
           ),
-          Padding(
-            padding: const EdgeInsetsDirectional.symmetric(
-              horizontal: Sizes.spaceXLarge,
-            ),
-            child: Column(
-              children: [
-                Text(
-                  translate(
-                    'background_fetch_notice_text',
-                  ),
-                  style: FontTheme.of(context).body1.primary().copyWith(),
-                  softWrap: true,
-                  textAlign: TextAlign.justify,
+          child: Column(
+            children: [
+              Text(
+                translate(
+                  'background_fetch_notice_text',
                 ),
-                const SizedBox(
-                  height: Sizes.spaceNormal,
-                ),
-                MxcButton.primary(
-                  key: const ValueKey('acknowledgeButton'),
-                  title: translate('acknowledge'),
-                  onTap: () {
-                    Navigator.of(context).pop(true);
-                  },
-                  size: AxsButtonSize.xl,
-                ),
-              ],
-            ),
-          )
-        ],
-      ),
+                style: FontTheme.of(context, listen: false)
+                    .body1
+                    .primary()
+                    .copyWith(),
+                softWrap: true,
+                textAlign: TextAlign.justify,
+              ),
+              const SizedBox(
+                height: Sizes.spaceNormal,
+              ),
+              MxcButton.primary(
+                key: const ValueKey('acknowledgeButton'),
+                title: translate('acknowledge'),
+                onTap: () {
+                  Navigator.of(context).pop(true);
+                },
+                size: MXCWalletButtonSize.xl,
+              ),
+            ],
+          ),
+        )
+      ],
     ),
   );
 }
diff --git a/lib/features/settings/subfeatures/notifications/widgets/bg_notifications_frequency_dialog.dart b/lib/features/settings/subfeatures/notifications/widgets/bg_notifications_frequency_dialog.dart
index 7d1c8b90..4fdcafe2 100644
--- a/lib/features/settings/subfeatures/notifications/widgets/bg_notifications_frequency_dialog.dart
+++ b/lib/features/settings/subfeatures/notifications/widgets/bg_notifications_frequency_dialog.dart
@@ -1,93 +1,83 @@
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 
-Future<bool?> showBGNotificationsFrequencyDialog(BuildContext context,
-    {required void Function(PeriodicalCallDuration duration) onTap,
-    required PeriodicalCallDuration selectedFrequency}) {
+Future<bool?> showBGNotificationsFrequencyDialog(
+  BuildContext context, {
+  required void Function(PeriodicalCallDuration duration) onTap,
+  required PeriodicalCallDuration selectedFrequency,
+}) {
   String translate(String text) => FlutterI18n.translate(context, text);
 
-  return showModalBottomSheet<bool>(
+  return showBaseBottomSheet<bool>(
     context: context,
-    useRootNavigator: true,
-    isScrollControlled: true,
-    useSafeArea: true,
-    backgroundColor: Colors.transparent,
-    builder: (BuildContext context) => Container(
-      padding: const EdgeInsets.only(
-          top: Sizes.spaceNormal, bottom: Sizes.space3XLarge),
-      decoration: BoxDecoration(
-        color: ColorsTheme.of(context).layerSheetBackground,
-        borderRadius: const BorderRadius.only(
-          topLeft: Radius.circular(20),
-          topRight: Radius.circular(20),
-        ),
-      ),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          Padding(
-            padding: const EdgeInsetsDirectional.only(
-                start: Sizes.spaceNormal,
-                end: Sizes.spaceNormal,
-                bottom: Sizes.space2XLarge),
-            child: MxcAppBarEvenly.title(
-              titleText: translate('select_x')
-                  .replaceFirst('{0}', translate('frequency').toLowerCase()),
-              action: Container(
-                alignment: Alignment.centerRight,
-                child: InkWell(
-                  child: Icon(
-                    MxcIcons.close,
-                    size: 32,
-                    color: ColorsTheme.of(context).iconPrimary,
-                  ),
-                  onTap: () => Navigator.of(context).pop(false),
+    content: Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Padding(
+          padding: const EdgeInsetsDirectional.only(
+              start: Sizes.spaceNormal,
+              end: Sizes.spaceNormal,
+              bottom: Sizes.space2XLarge),
+          child: MxcAppBarEvenly.title(
+            titleText: translate('select_x')
+                .replaceFirst('{0}', translate('frequency').toLowerCase()),
+            action: Container(
+              alignment: Alignment.centerRight,
+              child: InkWell(
+                child: Icon(
+                  MxcIcons.close,
+                  size: 32,
+                  color: ColorsTheme.of(context, listen: false).iconPrimary,
                 ),
+                onTap: () => Navigator.of(context).pop(false),
               ),
             ),
           ),
-          ...PeriodicalCallDuration.values
-              .map((e) => InkWell(
-                    onTap: () {
-                      onTap(e);
-                      Navigator.of(context).pop(false);
-                    },
-                    child: Row(
-                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      children: [
-                        Flexible(
-                          child: Container(
-                            padding: const EdgeInsets.symmetric(
-                                horizontal: Sizes.spaceXLarge,
-                                vertical: Sizes.spaceSmall),
-                            alignment: AlignmentDirectional.centerStart,
-                            child: Text(
-                              e.toStringFormatted(),
-                              style: FontTheme.of(context).body2.primary(),
-                              softWrap: true,
-                              overflow: TextOverflow.ellipsis,
-                            ),
+        ),
+        ...PeriodicalCallDuration.values
+            .map((e) => InkWell(
+                  onTap: () {
+                    onTap(e);
+                    Navigator.of(context).pop(false);
+                  },
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Flexible(
+                        child: Container(
+                          padding: const EdgeInsets.symmetric(
+                              horizontal: Sizes.spaceXLarge,
+                              vertical: Sizes.spaceSmall),
+                          alignment: AlignmentDirectional.centerStart,
+                          child: Text(
+                            e.toStringFormatted(),
+                            style: FontTheme.of(context, listen: false)
+                                .body2
+                                .primary(),
+                            softWrap: true,
+                            overflow: TextOverflow.ellipsis,
                           ),
                         ),
-                        if (selectedFrequency == e)
-                          Padding(
-                            padding: const EdgeInsets.symmetric(
-                                horizontal: Sizes.spaceNormal),
-                            child: Icon(
-                              MxcIcons.check,
-                              size: 24,
-                              color: ColorsTheme.of(context).white400,
-                            ),
+                      ),
+                      if (selectedFrequency == e)
+                        Padding(
+                          padding: const EdgeInsets.symmetric(
+                              horizontal: Sizes.spaceNormal),
+                          child: Icon(
+                            MxcIcons.check,
+                            size: 24,
+                            color:
+                                ColorsTheme.of(context, listen: false).white400,
                           ),
-                      ],
-                    ),
-                  ))
-              .toList(),
-        ],
-      ),
+                        ),
+                    ],
+                  ),
+                ))
+            .toList(),
+      ],
     ),
   );
 }
diff --git a/lib/features/settings/subfeatures/notifications/widgets/epoch_occur_dialog.dart b/lib/features/settings/subfeatures/notifications/widgets/epoch_occur_dialog.dart
index 033f11da..6a433fb9 100644
--- a/lib/features/settings/subfeatures/notifications/widgets/epoch_occur_dialog.dart
+++ b/lib/features/settings/subfeatures/notifications/widgets/epoch_occur_dialog.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_ui/mxc_ui.dart';
@@ -7,87 +7,75 @@ Future<bool?> showEpochOccurDialog(BuildContext context,
     {required void Function(int occur) onTap, required selectedOccur}) {
   String translate(String text) => FlutterI18n.translate(context, text);
 
-  return showModalBottomSheet<bool>(
+  return showBaseBottomSheet<bool>(
     context: context,
-    useRootNavigator: true,
-    isScrollControlled: true,
-    useSafeArea: true,
-    backgroundColor: Colors.transparent,
-    builder: (BuildContext context) => Container(
-      padding: const EdgeInsets.only(
-          top: Sizes.spaceNormal, bottom: Sizes.space3XLarge),
-      decoration: BoxDecoration(
-        color: ColorsTheme.of(context).layerSheetBackground,
-        borderRadius: const BorderRadius.only(
-          topLeft: Radius.circular(20),
-          topRight: Radius.circular(20),
-        ),
-      ),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          Padding(
-            padding: const EdgeInsetsDirectional.only(
-                start: Sizes.spaceNormal,
-                end: Sizes.spaceNormal,
-                bottom: Sizes.space2XLarge),
-            child: MxcAppBarEvenly.title(
-              titleText: translate('select_x')
-                  .replaceFirst('{0}', translate('occurrence').toLowerCase()),
-              action: Container(
-                alignment: Alignment.centerRight,
-                child: InkWell(
-                  child: Icon(
-                    MxcIcons.close,
-                    size: 32,
-                    color: ColorsTheme.of(context).iconPrimary,
-                  ),
-                  onTap: () => Navigator.of(context).pop(false),
+    content: Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Padding(
+          padding: const EdgeInsetsDirectional.only(
+              start: Sizes.spaceNormal,
+              end: Sizes.spaceNormal,
+              bottom: Sizes.space2XLarge),
+          child: MxcAppBarEvenly.title(
+            titleText: translate('select_x')
+                .replaceFirst('{0}', translate('occurrence').toLowerCase()),
+            action: Container(
+              alignment: Alignment.centerRight,
+              child: InkWell(
+                child: Icon(
+                  MxcIcons.close,
+                  size: 32,
+                  color: ColorsTheme.of(context, listen: false).iconPrimary,
                 ),
+                onTap: () => Navigator.of(context).pop(false),
               ),
             ),
           ),
-          Expanded(
-            child: ListView.builder(
-                itemCount: 100,
-                itemBuilder: (context, index) => InkWell(
-                      onTap: () {
-                        onTap(index + 1);
-                        Navigator.of(context).pop(false);
-                      },
-                      child: Row(
-                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                        children: [
-                          Flexible(
-                            child: Container(
-                              padding: const EdgeInsets.symmetric(
-                                  horizontal: Sizes.spaceXLarge,
-                                  vertical: Sizes.spaceSmall),
-                              alignment: AlignmentDirectional.centerStart,
-                              child: Text(
-                                (index + 1).toString(),
-                                style: FontTheme.of(context).body2.primary(),
-                                softWrap: true,
-                                overflow: TextOverflow.ellipsis,
-                              ),
+        ),
+        Expanded(
+          child: ListView.builder(
+              itemCount: 100,
+              itemBuilder: (context, index) => InkWell(
+                    onTap: () {
+                      onTap(index + 1);
+                      Navigator.of(context).pop(false);
+                    },
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        Flexible(
+                          child: Container(
+                            padding: const EdgeInsets.symmetric(
+                                horizontal: Sizes.spaceXLarge,
+                                vertical: Sizes.spaceSmall),
+                            alignment: AlignmentDirectional.centerStart,
+                            child: Text(
+                              (index + 1).toString(),
+                              style: FontTheme.of(context, listen: false)
+                                  .body2
+                                  .primary(),
+                              softWrap: true,
+                              overflow: TextOverflow.ellipsis,
                             ),
                           ),
-                          if (selectedOccur == index + 1)
-                            Padding(
-                              padding: const EdgeInsets.symmetric(
-                                  horizontal: Sizes.spaceNormal),
-                              child: Icon(
-                                MxcIcons.check,
-                                size: 24,
-                                color: ColorsTheme.of(context).white400,
-                              ),
+                        ),
+                        if (selectedOccur == index + 1)
+                          Padding(
+                            padding: const EdgeInsets.symmetric(
+                                horizontal: Sizes.spaceNormal),
+                            child: Icon(
+                              MxcIcons.check,
+                              size: 24,
+                              color: ColorsTheme.of(context, listen: false)
+                                  .white400,
                             ),
-                        ],
-                      ),
-                    )),
-          )
-        ],
-      ),
+                          ),
+                      ],
+                    ),
+                  )),
+        )
+      ],
     ),
   );
 }
diff --git a/lib/features/settings/subfeatures/qr_code/qr_scanner/qr_scanner_page.dart b/lib/features/settings/subfeatures/qr_code/qr_scanner/qr_scanner_page.dart
index ec939fab..24e39c19 100644
--- a/lib/features/settings/subfeatures/qr_code/qr_scanner/qr_scanner_page.dart
+++ b/lib/features/settings/subfeatures/qr_code/qr_scanner/qr_scanner_page.dart
@@ -1,8 +1,8 @@
 import 'dart:io';
 
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/portfolio/subfeatures/token/send_token/choose_crypto/choose_crypto_page.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/portfolio/subfeatures/token/send_token/choose_crypto/choose_crypto_page.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_ui/mxc_ui.dart';
@@ -101,6 +101,7 @@ class _QrScannerPageState extends State<QrScannerPage> {
           key: const ValueKey('showQrCodeButton'),
           title: FlutterI18n.translate(context, 'show_qr_code'),
           icon: MxcIcons.qr_code,
+          edgeType: UIConfig.settingsScreensButtonsEdgeType,
           onTap: () => BottomFlowDialog.of(context).close(),
         ),
       ],
diff --git a/lib/features/settings/subfeatures/qr_code/show_qa_code/qr_code_page.dart b/lib/features/settings/subfeatures/qr_code/show_qa_code/qr_code_page.dart
index 09c5ff1f..0d1e6161 100644
--- a/lib/features/settings/subfeatures/qr_code/show_qa_code/qr_code_page.dart
+++ b/lib/features/settings/subfeatures/qr_code/show_qa_code/qr_code_page.dart
@@ -1,8 +1,8 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/security/presentation/passcode_authenticate/passcode_authenticate_user_page.dart';
-import 'package:datadashwallet/features/settings/presentation/widgets/account_managment/copyable_item.dart';
-import 'package:datadashwallet/features/settings/subfeatures/accounts/show_view_private_key_dialog.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/security/presentation/passcode_authenticate/passcode_authenticate_user_page.dart';
+import 'package:moonchain_wallet/features/settings/presentation/widgets/account_managment/copyable_item.dart';
+import 'package:moonchain_wallet/features/settings/subfeatures/accounts/show_view_private_key_dialog.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
@@ -37,9 +37,9 @@ class QrCodePage extends HookConsumerWidget {
       children: [
         Container(
           width: double.infinity,
-          decoration: ShapeDecoration(
-            color: ColorsTheme.of(context).primaryBackground,
-            shape: const RoundedRectangleBorder(
+          decoration: const ShapeDecoration(
+            color: Color(0xFF30363C),
+            shape: RoundedRectangleBorder(
               borderRadius: BorderRadius.all(Radius.circular(10)),
             ),
           ),
@@ -78,6 +78,7 @@ class QrCodePage extends HookConsumerWidget {
         MxcButton.secondary(
           key: const ValueKey('viewPrivateKeyButton'),
           title: FlutterI18n.translate(context, 'view_private_key'),
+          edgeType: UIConfig.settingsScreensButtonsEdgeType,
           onTap: () => Navigator.of(context)
               .push(
             route.featureDialog<PasscodeAuthenticateUserPage>(
@@ -99,6 +100,7 @@ class QrCodePage extends HookConsumerWidget {
           key: const ValueKey('scanQrCodeButton'),
           title: FlutterI18n.translate(context, 'scan_qr_code'),
           icon: MxcIcons.qr_code,
+          edgeType: UIConfig.settingsScreensButtonsEdgeType,
           onTap: () => Navigator.of(context).push(
             route.featureDialog(const QrScannerPage()),
           ),
diff --git a/lib/features/settings/subfeatures/security/security_settings_page.dart b/lib/features/settings/subfeatures/security/security_settings_page.dart
index 2a806780..ec2440aa 100644
--- a/lib/features/settings/subfeatures/security/security_settings_page.dart
+++ b/lib/features/settings/subfeatures/security/security_settings_page.dart
@@ -1,10 +1,10 @@
 import 'dart:io';
 
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/common/common.dart';
-import 'package:datadashwallet/features/security/presentation/passcode_change/passcode_change_enter_current_page/passcode_change_enter_current_page.dart';
-import 'package:datadashwallet/features/splash/splash.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
+import 'package:moonchain_wallet/features/security/presentation/passcode_change/passcode_change_enter_current_page/passcode_change_enter_current_page.dart';
+import 'package:moonchain_wallet/features/splash/splash.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -51,7 +51,8 @@ class SecuritySettingsPage extends HookConsumerWidget {
         MxcButton.secondary(
           key: const ValueKey('changePasscodeButton'),
           title: translate('change_passcode'),
-          size: AxsButtonSize.xl,
+          size: MXCWalletButtonSize.xl,
+          edgeType: UIConfig.settingsScreensButtonsEdgeType,
           onTap: () => Navigator.of(context).push(
             route.featureDialog<PasscodeChangeEnterCurrentPage>(
                 const PasscodeChangeEnterCurrentPage(
@@ -68,7 +69,8 @@ class SecuritySettingsPage extends HookConsumerWidget {
         MxcButton.secondary(
           key: const ValueKey('clearBrowserCacheButton'),
           title: translate('clear_browser_cache'),
-          size: AxsButtonSize.xl,
+          size: MXCWalletButtonSize.xl,
+          edgeType: UIConfig.settingsScreensButtonsEdgeType,
           onTap: () => ref.read(presenter).clearBrowserCache(),
         ),
         const SizedBox(height: Sizes.space4XLarge),
@@ -80,7 +82,8 @@ class SecuritySettingsPage extends HookConsumerWidget {
         MxcButton.primaryWarning(
           key: const ValueKey('deleteWalletButton'),
           title: translate('delete_wallet'),
-          size: AxsButtonSize.xl,
+          size: MXCWalletButtonSize.xl,
+          edgeType: UIConfig.settingsScreensButtonsEdgeType,
           onTap: () => ref.read(presenter).deleteWallet(),
           titleColor: ColorsTheme.of(context).textBlack200,
         ),
@@ -93,7 +96,8 @@ class SecuritySettingsPage extends HookConsumerWidget {
         MxcButton.secondary(
           key: const ValueKey('exportWalletButton'),
           title: translate('export_wallet'),
-          size: AxsButtonSize.xl,
+          size: MXCWalletButtonSize.xl,
+          edgeType: UIConfig.settingsScreensButtonsEdgeType,
           onTap: () => Navigator.of(context).push(
             route(const SplashStoragePage(
               settingsFlow: true,
diff --git a/lib/features/settings/subfeatures/security/security_settings_presenter.dart b/lib/features/settings/subfeatures/security/security_settings_presenter.dart
index 33b56010..3b97d180 100644
--- a/lib/features/settings/subfeatures/security/security_settings_presenter.dart
+++ b/lib/features/settings/subfeatures/security/security_settings_presenter.dart
@@ -1,7 +1,7 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/settings.dart';
-import 'package:datadashwallet/features/splash/splash.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/settings.dart';
+import 'package:moonchain_wallet/features/splash/splash.dart';
 import 'package:flutter/material.dart';
 import 'security_settings_state.dart';
 
diff --git a/lib/features/settings/subfeatures/security/widgets/delete_wallet_dialog.dart b/lib/features/settings/subfeatures/security/widgets/delete_wallet_dialog.dart
index d012d5e8..6b70d6bb 100644
--- a/lib/features/settings/subfeatures/security/widgets/delete_wallet_dialog.dart
+++ b/lib/features/settings/subfeatures/security/widgets/delete_wallet_dialog.dart
@@ -1,3 +1,4 @@
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:mxc_ui/mxc_ui.dart';
@@ -70,7 +71,8 @@ Future<bool?> showDeleteWalletDialog({
                     title:
                         FlutterI18n.translate(context, ok ?? 'delete_wallet'),
                     titleColor: ColorsTheme.of(context).textBlack200,
-                    size: AxsButtonSize.xl,
+                    size: MXCWalletButtonSize.xl,
+                    edgeType: UIConfig.settingsScreensButtonsEdgeType,
                     onTap: isButtonDisabled == true
                         ? () =>
                             Navigator.of(context).pop(controller.text == 'yes')
@@ -80,7 +82,8 @@ Future<bool?> showDeleteWalletDialog({
                   MxcButton.secondary(
                     key: const ValueKey('cancelButton'),
                     title: FlutterI18n.translate(context, cancel ?? 'cancel'),
-                    size: AxsButtonSize.xl,
+                    size: MXCWalletButtonSize.xl,
+                    edgeType: UIConfig.settingsScreensButtonsEdgeType,
                     onTap: () => Navigator.of(context).pop(false),
                   ),
                 ],
diff --git a/lib/features/settings/subfeatures/theme/domain/theme_cache_repository.dart b/lib/features/settings/subfeatures/theme/domain/theme_cache_repository.dart
index a4afdbaf..af5b9815 100644
--- a/lib/features/settings/subfeatures/theme/domain/theme_cache_repository.dart
+++ b/lib/features/settings/subfeatures/theme/domain/theme_cache_repository.dart
@@ -1,7 +1,7 @@
 import 'package:mxc_logic/mxc_logic.dart';
 
-import 'package:datadashwallet/common/serialization.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/common/serialization.dart';
+import 'package:moonchain_wallet/core/core.dart';
 
 import 'theme_option.dart';
 
diff --git a/lib/features/settings/subfeatures/theme/domain/theme_use_case.dart b/lib/features/settings/subfeatures/theme/domain/theme_use_case.dart
index 8771c477..53808402 100644
--- a/lib/features/settings/subfeatures/theme/domain/theme_use_case.dart
+++ b/lib/features/settings/subfeatures/theme/domain/theme_use_case.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'theme_cache_repository.dart';
 import 'theme_option.dart';
 
diff --git a/lib/features/settings/subfeatures/theme/presentation/app_theme_wrapper/app_theme_presenter.dart b/lib/features/settings/subfeatures/theme/presentation/app_theme_wrapper/app_theme_presenter.dart
index 61e7732a..a2934c23 100644
--- a/lib/features/settings/subfeatures/theme/presentation/app_theme_wrapper/app_theme_presenter.dart
+++ b/lib/features/settings/subfeatures/theme/presentation/app_theme_wrapper/app_theme_presenter.dart
@@ -2,8 +2,8 @@ import 'dart:ui';
 
 import 'package:flutter/scheduler.dart';
 import 'package:flutter/widgets.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/settings.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/settings.dart';
 
 import 'app_theme_state.dart';
 
diff --git a/lib/features/settings/subfeatures/theme/presentation/theme_settings/theme_settings_page.dart b/lib/features/settings/subfeatures/theme/presentation/theme_settings/theme_settings_page.dart
index 73699978..d81d9d27 100644
--- a/lib/features/settings/subfeatures/theme/presentation/theme_settings/theme_settings_page.dart
+++ b/lib/features/settings/subfeatures/theme/presentation/theme_settings/theme_settings_page.dart
@@ -1,6 +1,6 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/features/common/common.dart';
-import 'package:datadashwallet/features/settings/settings.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
+import 'package:moonchain_wallet/features/settings/settings.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -42,7 +42,7 @@ class ThemeSettingsPage extends ConsumerWidget {
                     children: [
                       Text(
                         FlutterI18n.translate(context, item.name),
-                        style: FontTheme.of(context).body1(),
+                        style: FontTheme.of(context).body2(),
                       ),
                       if (option == item) ...[
                         const Icon(Icons.check_rounded),
diff --git a/lib/features/settings/subfeatures/theme/presentation/theme_settings/theme_settings_presenter.dart b/lib/features/settings/subfeatures/theme/presentation/theme_settings/theme_settings_presenter.dart
index aa6cfb30..b0e42457 100644
--- a/lib/features/settings/subfeatures/theme/presentation/theme_settings/theme_settings_presenter.dart
+++ b/lib/features/settings/subfeatures/theme/presentation/theme_settings/theme_settings_presenter.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/settings/settings.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/settings/settings.dart';
 
 import 'theme_settings_state.dart';
 
diff --git a/lib/features/settings/subfeatures/theme/presentation/theme_settings/theme_settings_state.dart b/lib/features/settings/subfeatures/theme/presentation/theme_settings/theme_settings_state.dart
index 4c6b9830..1de3a9f0 100644
--- a/lib/features/settings/subfeatures/theme/presentation/theme_settings/theme_settings_state.dart
+++ b/lib/features/settings/subfeatures/theme/presentation/theme_settings/theme_settings_state.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/features/settings/settings.dart';
+import 'package:moonchain_wallet/features/settings/settings.dart';
 import 'package:equatable/equatable.dart';
 
 class ThemeSettingsState with EquatableMixin {
diff --git a/lib/features/settings/subfeatures/xsd_conversion_rate/xsd_conversion_rate_page.dart b/lib/features/settings/subfeatures/xsd_conversion_rate/xsd_conversion_rate_page.dart
index 25bd5d0d..1933637c 100644
--- a/lib/features/settings/subfeatures/xsd_conversion_rate/xsd_conversion_rate_page.dart
+++ b/lib/features/settings/subfeatures/xsd_conversion_rate/xsd_conversion_rate_page.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/features/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
@@ -84,7 +84,8 @@ class XsdConversionRatePage extends HookConsumerWidget {
               return MxcButton.secondary(
                 key: const ValueKey('resetXsdRateButton'),
                 title: FlutterI18n.translate(context, 'reset_xsd_rate'),
-                size: AxsButtonSize.xl,
+                size: MXCWalletButtonSize.xl,
+                edgeType: UIConfig.settingsScreensButtonsEdgeType,
                 onTap: rateValue.text.isNotEmpty
                     ? () {
                         if (!formKey.currentState!.validate()) return;
diff --git a/lib/features/settings/subfeatures/xsd_conversion_rate/xsd_conversion_rate_presenter.dart b/lib/features/settings/subfeatures/xsd_conversion_rate/xsd_conversion_rate_presenter.dart
index 448cdfe3..14b76121 100644
--- a/lib/features/settings/subfeatures/xsd_conversion_rate/xsd_conversion_rate_presenter.dart
+++ b/lib/features/settings/subfeatures/xsd_conversion_rate/xsd_conversion_rate_presenter.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:flutter/material.dart';
 import 'xsd_conversion_rate_state.dart';
 
diff --git a/lib/features/splash/create_storage/presentation/create_storage_page.dart b/lib/features/splash/create_storage/presentation/create_storage_page.dart
index 6a910985..4c75b916 100644
--- a/lib/features/splash/create_storage/presentation/create_storage_page.dart
+++ b/lib/features/splash/create_storage/presentation/create_storage_page.dart
@@ -1,6 +1,8 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
-import 'package:datadashwallet/features/splash/splash.dart';
+import 'dart:io';
+
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
+import 'package:moonchain_wallet/features/splash/splash.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -27,6 +29,8 @@ class SplashStoragePage extends SplashBasePage {
         text: FlutterI18n.translate(context, 'create_wallet'));
   }
 
+  MXCWalletButtonEdgeType getPageButtonsEdge() => MXCWalletButtonEdgeType.hard;
+
   @override
   List<Widget> setButtons(BuildContext context, WidgetRef ref) {
     final isEmailAvailable = ref.watch(state).isEmailAppAvailable == true;
@@ -52,6 +56,7 @@ class SplashStoragePage extends SplashBasePage {
                   ),
                 )
             : null,
+        edgeType: getPageButtonsEdge(),
       ),
       MxcButton.secondaryWhite(
         key: const ValueKey('wechatButton'),
@@ -68,6 +73,7 @@ class SplashStoragePage extends SplashBasePage {
                   ),
                 )
             : null,
+        edgeType: getPageButtonsEdge(),
       ),
       MxcButton.secondaryWhite(
         key: const ValueKey('emailButton'),
@@ -84,6 +90,7 @@ class SplashStoragePage extends SplashBasePage {
                   ),
                 )
             : null,
+        edgeType: getPageButtonsEdge(),
       ),
       isNoneAvailable
           ? MxcButton.secondaryWhite(
@@ -99,8 +106,41 @@ class SplashStoragePage extends SplashBasePage {
                   ),
                 ),
               ),
+              edgeType: getPageButtonsEdge(),
             )
           : Container(),
+      Platform.isAndroid
+          ? MxcButton.secondaryWhite(
+              key: const ValueKey('GoogleDriveButton'),
+              icon: MxcIcons.google_drive,
+              iconSize: 24,
+              titleSize: 18,
+              title: FlutterI18n.translate(
+                  context, 'google_drive_secured_storage'),
+              onTap: () => Navigator.of(context).push(
+                route.featureDialog(
+                  GoogleDriveRecoveryPhrasePage(
+                    settingsFlow: settingsFlow,
+                  ),
+                ),
+              ),
+              edgeType: getPageButtonsEdge(),
+            )
+          : MxcButton.secondaryWhite(
+              key: const ValueKey('icloudButton'),
+              icon: MxcIcons.icloud,
+              iconSize: 18,
+              titleSize: 18,
+              title: FlutterI18n.translate(context, 'icloud_secured_storage'),
+              onTap: () => Navigator.of(context).push(
+                route.featureDialog(
+                  ICloudRecoveryPhrasePage(
+                    settingsFlow: settingsFlow,
+                  ),
+                ),
+              ),
+              edgeType: getPageButtonsEdge(),
+            ),
     ];
   }
 }
diff --git a/lib/features/splash/create_storage/presentation/create_storage_presenter.dart b/lib/features/splash/create_storage/presentation/create_storage_presenter.dart
index 60012c93..a40de63d 100644
--- a/lib/features/splash/create_storage/presentation/create_storage_presenter.dart
+++ b/lib/features/splash/create_storage/presentation/create_storage_presenter.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/splash/splash.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/splash/splash.dart';
 
 final splashStorageContainer =
     PresenterContainer<SplashStoragePresenter, SplashBaseState>(
diff --git a/lib/features/splash/import_storage/import_storage_page.dart b/lib/features/splash/import_storage/import_storage_page.dart
index 06efb43a..0eafd373 100644
--- a/lib/features/splash/import_storage/import_storage_page.dart
+++ b/lib/features/splash/import_storage/import_storage_page.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/splash/splash.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/splash/splash.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -23,6 +23,8 @@ class SplashImportStoragePage extends SplashBasePage {
         text: FlutterI18n.translate(context, 'import_wallet'));
   }
 
+  MXCWalletButtonEdgeType getPageButtonsEdge() => MXCWalletButtonEdgeType.hard;
+
   @override
   List<Widget> setButtons(BuildContext context, WidgetRef ref) {
     final isTelegramAvailable = ref.watch(state).applist['telegram'] == true ||
@@ -40,6 +42,7 @@ class SplashImportStoragePage extends SplashBasePage {
         onTap: isTelegramAvailable
             ? () => ref.read(presenter).openTelegram()
             : null,
+        edgeType: getPageButtonsEdge(),
       ),
       MxcButton.secondaryWhite(
         key: const ValueKey('wechatButton'),
@@ -49,6 +52,7 @@ class SplashImportStoragePage extends SplashBasePage {
         title: FlutterI18n.translate(context, 'wechat_secured_storage'),
         onTap:
             isWeChatAvailable ? () => ref.read(presenter).openWechat() : null,
+        edgeType: getPageButtonsEdge(),
       ),
       MxcButton.secondaryWhite(
         key: const ValueKey('mnemonicButton'),
@@ -61,6 +65,7 @@ class SplashImportStoragePage extends SplashBasePage {
             const SplashImportWalletPage(),
           ),
         ),
+        edgeType: getPageButtonsEdge(),
       ),
       !isNoneAvailable
           ? MxcButton.secondaryWhite(
@@ -70,8 +75,9 @@ class SplashImportStoragePage extends SplashBasePage {
               titleSize: 18,
               title: FlutterI18n.translate(context, 'local_secured_storage'),
               onTap: () => ref.read(presenter).openLocalSeedPhrase(),
+              edgeType: getPageButtonsEdge(),
             )
-          : Container()
+          : Container(),
     ];
   }
 }
diff --git a/lib/features/splash/import_storage/import_storage_presenter.dart b/lib/features/splash/import_storage/import_storage_presenter.dart
index 0428c5a4..87ae7a9d 100644
--- a/lib/features/splash/import_storage/import_storage_presenter.dart
+++ b/lib/features/splash/import_storage/import_storage_presenter.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/splash/splash.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/splash/splash.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'package:open_file_manager/open_file_manager.dart';
 import 'package:open_mail_app/open_mail_app.dart';
diff --git a/lib/features/splash/import_wallet/import_wallet_page.dart b/lib/features/splash/import_wallet/import_wallet_page.dart
index 6f12f960..3c476bc9 100644
--- a/lib/features/splash/import_wallet/import_wallet_page.dart
+++ b/lib/features/splash/import_wallet/import_wallet_page.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
@@ -37,6 +37,7 @@ class SplashImportWalletPage extends HookConsumerWidget {
                         presenter.confirm();
                       }
                     : null,
+                edgeType: MXCWalletButtonEdgeType.hard,
               ),
             );
           }),
diff --git a/lib/features/splash/import_wallet/import_wallet_presenter.dart b/lib/features/splash/import_wallet/import_wallet_presenter.dart
index df064cd3..7275e450 100644
--- a/lib/features/splash/import_wallet/import_wallet_presenter.dart
+++ b/lib/features/splash/import_wallet/import_wallet_presenter.dart
@@ -1,7 +1,7 @@
 import 'package:clipboard/clipboard.dart';
 import 'package:mxc_logic/mxc_logic.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/security/security.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/security/security.dart';
 import 'package:flutter/material.dart';
 
 final splashImportWalletContainer =
diff --git a/lib/features/splash/mns_process/presentation/mns_announcement/mns_announcement_page.dart b/lib/features/splash/mns_process/presentation/mns_announcement/mns_announcement_page.dart
index a4d0d342..4460cbde 100644
--- a/lib/features/splash/mns_process/presentation/mns_announcement/mns_announcement_page.dart
+++ b/lib/features/splash/mns_process/presentation/mns_announcement/mns_announcement_page.dart
@@ -1,11 +1,12 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/dapps/dapps.dart';
-import 'package:datadashwallet/features/splash/mns_process/mns.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/dapps/dapps.dart';
+import 'package:moonchain_wallet/features/splash/mns_process/mns.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:moonchain_wallet/main.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 
 import '../widgets/address_bar.dart';
@@ -42,18 +43,21 @@ class SplashMNSAnnouncementPage extends HookConsumerWidget {
               const SplashMNSQueryPage(),
             ),
           ),
+          edgeType: UIConfig.securityScreensButtonsEdgeType,
         ),
       ),
       children: [
-        Image(
-          image: ImagesTheme.of(context).mxc,
-          width: 61,
-          height: 68,
+        Padding(
+          padding: const EdgeInsets.symmetric(vertical: Sizes.spaceXSmall),
+          child: Text(
+            appName,
+            style: FontTheme.of(context).logo(),
+          ),
         ),
         Padding(
           padding: const EdgeInsets.symmetric(vertical: 8),
           child: Text(
-            FlutterI18n.translate(context, 'mxc_zkevm_username'),
+            FlutterI18n.translate(context, 'moonchain_username'),
             style: FontTheme.of(context).h4.white(),
             textAlign: TextAlign.center,
           ),
diff --git a/lib/features/splash/mns_process/presentation/mns_announcement/mns_announcement_presenter.dart b/lib/features/splash/mns_process/presentation/mns_announcement/mns_announcement_presenter.dart
index cf16b623..a31d0449 100644
--- a/lib/features/splash/mns_process/presentation/mns_announcement/mns_announcement_presenter.dart
+++ b/lib/features/splash/mns_process/presentation/mns_announcement/mns_announcement_presenter.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/core/core.dart';
 
 final splashMNSAnnouncementContainer =
     PresenterContainer<SplashMNSAnnouncementPresenter, void>(
diff --git a/lib/features/splash/mns_process/presentation/mns_query/mns_query_page.dart b/lib/features/splash/mns_process/presentation/mns_query/mns_query_page.dart
index 6a64f1a1..dcece76e 100644
--- a/lib/features/splash/mns_process/presentation/mns_query/mns_query_page.dart
+++ b/lib/features/splash/mns_process/presentation/mns_query/mns_query_page.dart
@@ -1,6 +1,6 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/dapps/dapps.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/dapps/dapps.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
@@ -67,7 +67,7 @@ class SplashMNSQueryPage extends HookConsumerWidget {
         ),
         const SizedBox(height: 8),
         Text(
-          FlutterI18n.translate(context, 'prowerd_zkevm'),
+          FlutterI18n.translate(context, 'powered_by_moonchain_supernodes'),
           style: FontTheme.of(context).caption1.white().copyWith(
                 color: Colors.white.withOpacity(0.5),
               ),
diff --git a/lib/features/splash/mns_process/presentation/mns_query/mns_query_presenter.dart b/lib/features/splash/mns_process/presentation/mns_query/mns_query_presenter.dart
index 653c1ab9..f7fa41d8 100644
--- a/lib/features/splash/mns_process/presentation/mns_query/mns_query_presenter.dart
+++ b/lib/features/splash/mns_process/presentation/mns_query/mns_query_presenter.dart
@@ -1,6 +1,6 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/features/dapps/dapps.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/features/dapps/dapps.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
diff --git a/lib/features/splash/mns_process/presentation/widgets/no_balance_dialog.dart b/lib/features/splash/mns_process/presentation/widgets/no_balance_dialog.dart
index 6ecdb9f2..297508a3 100644
--- a/lib/features/splash/mns_process/presentation/widgets/no_balance_dialog.dart
+++ b/lib/features/splash/mns_process/presentation/widgets/no_balance_dialog.dart
@@ -42,7 +42,7 @@ Future<bool?> showNoBalanceDialog(
                 MxcButton.secondary(
                   key: const ValueKey('cancelButton'),
                   title: FlutterI18n.translate(context, 'skip'),
-                  size: AxsButtonSize.xl,
+                  size: MXCWalletButtonSize.xl,
                   width: 120,
                   onTap: () => Navigator.of(context).pop(false),
                 ),
@@ -50,7 +50,7 @@ Future<bool?> showNoBalanceDialog(
                   key: const ValueKey('okayButton'),
                   title: FlutterI18n.translate(context, 'receive'),
                   titleColor: ColorsTheme.of(context).textBlack200,
-                  size: AxsButtonSize.xl,
+                  size: MXCWalletButtonSize.xl,
                   width: 120,
                   onTap: () => Navigator.of(context).pop(true),
                 ),
diff --git a/lib/features/splash/secure_recovery_phrase/presentation/email_recovery_phrase_alert/email_recovery_phrase_page.dart b/lib/features/splash/secure_recovery_phrase/presentation/email_recovery_phrase_alert/email_recovery_phrase_page.dart
index e23a5bac..c855bc6a 100644
--- a/lib/features/splash/secure_recovery_phrase/presentation/email_recovery_phrase_alert/email_recovery_phrase_page.dart
+++ b/lib/features/splash/secure_recovery_phrase/presentation/email_recovery_phrase_alert/email_recovery_phrase_page.dart
@@ -1,4 +1,5 @@
-import 'package:datadashwallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -27,12 +28,15 @@ class EmailRecoveryPhrasePage extends RecoveryPhraseBasePage {
   Widget icon(BuildContext context) => Icon(
         MxcIcons.email,
         size: 40,
-        color: themeColor(),
+        color: themeColor(context: context),
       );
 
   @override
   Color themeColor({BuildContext? context}) => const Color(0xFFE64340);
 
+  String translate(BuildContext context, String text) =>
+      FlutterI18n.translate(context, text);
+
   @override
   Widget buildAlert(BuildContext context) {
     return Container(
@@ -41,7 +45,7 @@ class EmailRecoveryPhrasePage extends RecoveryPhraseBasePage {
       padding: const EdgeInsets.all(24),
       decoration: BoxDecoration(
         color: ColorsTheme.of(context).cardBackground,
-        borderRadius: const BorderRadius.all(Radius.circular(10)),
+        borderRadius: const BorderRadius.all(Radius.zero),
       ),
       child: Column(
         children: [
@@ -51,7 +55,7 @@ class EmailRecoveryPhrasePage extends RecoveryPhraseBasePage {
             padding: const EdgeInsets.all(18),
             decoration: BoxDecoration(
               shape: BoxShape.circle,
-              color: themeColor(),
+              color: themeColor(context: context),
             ),
             child: const Icon(
               MxcIcons.email,
@@ -73,15 +77,84 @@ class EmailRecoveryPhrasePage extends RecoveryPhraseBasePage {
   }
 
   @override
-  Widget? buildFooter(BuildContext context, WidgetRef ref) => MxcButton.primary(
+  Widget? buildEmailInput(BuildContext context, WidgetRef ref) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        const SizedBox(height: Sizes.space3XLarge),
+        Text(
+          '${FlutterI18n.translate(context, 'from')}:',
+          style: FontTheme.of(context).caption1().copyWith(
+                fontWeight: FontWeight.w500,
+                color: ColorsTheme.of(context).textPrimary,
+              ),
+          textAlign: TextAlign.start,
+        ),
+        const SizedBox(height: Sizes.space2XSmall),
+        Form(
+          key: ref.watch(state).formKey,
+          child: MxcTextField(
+            key: const Key('fromTextField'),
+            controller: ref.read(presenter).fromController,
+            hint: FlutterI18n.translate(context, 'your_email_address'),
+            keyboardType: TextInputType.emailAddress,
+            validator: (value) {
+              // ref.read(presenter).fromController;
+              final res = Validation.notEmpty(
+                  context,
+                  value,
+                  translate(context, 'x_not_empty')
+                      .replaceFirst('{0}', translate(context, 'email')));
+
+              if (res != null) {
+                return res;
+              }
+
+              return Validation.checkEmailAddress(context, value!); //
+            },
+            onChanged: (value) =>
+                ref.read(state).formKey.currentState!.validate(),
+          ),
+        ),
+        const SizedBox(height: Sizes.spaceXSmall),
+        Text(
+          '${FlutterI18n.translate(context, 'to')}:',
+          style: FontTheme.of(context).caption1().copyWith(
+                fontWeight: FontWeight.w500,
+                color: ColorsTheme.of(context).textPrimary,
+              ),
+          textAlign: TextAlign.start,
+        ),
+        const SizedBox(height: Sizes.spaceSmall),
+        MxcTextField(
+          key: const Key('fromTextField'),
+          controller: ref.read(presenter).fromController,
+          hint: FlutterI18n.translate(context, 'your_email_address'),
+          keyboardType: TextInputType.emailAddress,
+          readOnly: true,
+          hasClearButton: false,
+        ),
+      ],
+    );
+  }
+
+  @override
+  Widget? buildFooter(BuildContext context, WidgetRef ref) =>
+      MxcButton.primaryWhite(
         key: const ValueKey('storeButton'),
         title: FlutterI18n.translate(context, 'email_to_myself'),
         titleColor: ColorsTheme.of(context).textBlack200,
-        color: themeColor(),
-        borderColor: themeColor(),
-        onTap: () => ref.read(presenter).sendEmail(
-              context,
-              settingsFlow,
-            ),
+        titleSize: 18,
+        onTap: () {
+          if (!ref.read(state).formKey.currentState!.validate()) {
+            return;
+          }
+          ref.read(presenter).sendEmail(
+                context,
+                settingsFlow,
+                ref.read(presenter).fromController.text,
+              );
+        },
+        edgeType: MXCWalletButtonEdgeType.hard,
       );
 }
diff --git a/lib/features/splash/secure_recovery_phrase/presentation/email_recovery_phrase_alert/email_recovery_phrase_presenter.dart b/lib/features/splash/secure_recovery_phrase/presentation/email_recovery_phrase_alert/email_recovery_phrase_presenter.dart
index 2997587d..4fcf955a 100644
--- a/lib/features/splash/secure_recovery_phrase/presentation/email_recovery_phrase_alert/email_recovery_phrase_presenter.dart
+++ b/lib/features/splash/secure_recovery_phrase/presentation/email_recovery_phrase_alert/email_recovery_phrase_presenter.dart
@@ -1,5 +1,6 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
+import 'package:flutter/material.dart';
 
 import 'email_recovery_phrase_state.dart';
 
@@ -10,4 +11,15 @@ final emailRecoveryPhraseContainer =
 class EmailRecoveryPhrasePresenter
     extends RecoveryPhraseBasePresenter<EmailRecoveryPhrasetState> {
   EmailRecoveryPhrasePresenter() : super(EmailRecoveryPhrasetState());
+
+  final TextEditingController fromController = TextEditingController();
+  final TextEditingController toController = TextEditingController();
+  @override
+  void initState() {
+    super.initState();
+
+    fromController.addListener(
+      () => toController.text = fromController.text,
+    );
+  }
 }
diff --git a/lib/features/splash/secure_recovery_phrase/presentation/email_recovery_phrase_alert/email_recovery_phrase_state.dart b/lib/features/splash/secure_recovery_phrase/presentation/email_recovery_phrase_alert/email_recovery_phrase_state.dart
index f2f602f5..38a31ddb 100644
--- a/lib/features/splash/secure_recovery_phrase/presentation/email_recovery_phrase_alert/email_recovery_phrase_state.dart
+++ b/lib/features/splash/secure_recovery_phrase/presentation/email_recovery_phrase_alert/email_recovery_phrase_state.dart
@@ -1,10 +1,11 @@
 import 'package:equatable/equatable.dart';
-import 'package:datadashwallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
+import 'package:moonchain_wallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
+import 'package:flutter/material.dart';
 
 class EmailRecoveryPhrasetState extends RecoveryPhraseBaseState
     with EquatableMixin {
+  GlobalKey<FormState> formKey = GlobalKey<FormState>();
+
   @override
-  List<Object?> get props => [
-        super.props,
-      ];
+  List<Object?> get props => [super.props, formKey];
 }
diff --git a/lib/features/splash/secure_recovery_phrase/presentation/google_drive_recovery_phrase_alert/google_drive_recovery_phrase_alert.dart b/lib/features/splash/secure_recovery_phrase/presentation/google_drive_recovery_phrase_alert/google_drive_recovery_phrase_alert.dart
new file mode 100644
index 00000000..9bb6529a
--- /dev/null
+++ b/lib/features/splash/secure_recovery_phrase/presentation/google_drive_recovery_phrase_alert/google_drive_recovery_phrase_alert.dart
@@ -0,0 +1,3 @@
+export 'google_drive_recovery_phrase_page.dart';
+export 'google_drive_recovery_phrase_presenter.dart';
+export 'google_drive_recovery_phrase_state.dart';
\ No newline at end of file
diff --git a/lib/features/splash/secure_recovery_phrase/presentation/google_drive_recovery_phrase_alert/google_drive_recovery_phrase_page.dart b/lib/features/splash/secure_recovery_phrase/presentation/google_drive_recovery_phrase_alert/google_drive_recovery_phrase_page.dart
new file mode 100644
index 00000000..022bc920
--- /dev/null
+++ b/lib/features/splash/secure_recovery_phrase/presentation/google_drive_recovery_phrase_alert/google_drive_recovery_phrase_page.dart
@@ -0,0 +1,86 @@
+import 'package:moonchain_wallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_i18n/flutter_i18n.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:mxc_ui/mxc_ui.dart';
+
+class GoogleDriveRecoveryPhrasePage extends RecoveryPhraseBasePage {
+  const GoogleDriveRecoveryPhrasePage({
+    Key? key,
+    this.settingsFlow = false,
+  }) : super(key: key);
+
+  final bool settingsFlow;
+
+  @override
+  ProviderBase<GoogleDriveRecoveryPhrasePresenter> get presenter =>
+      googleDriveRecoveryPhraseContainer.actions;
+
+  @override
+  ProviderBase<GoogleDriveRecoveryPhraseState> get state =>
+      googleDriveRecoveryPhraseContainer.state;
+
+  @override
+  Widget icon(BuildContext context) => getIcon(context);
+
+  @override
+  Color themeColor({BuildContext? context}) => ColorsTheme.of(context!).white;
+
+  Widget getIcon(BuildContext context) {
+    return Icon(
+      MxcIcons.google_drive,
+      color: ColorsTheme.of(context).blackDeep,
+      size: 51,
+    );
+  }
+
+  @override
+  Widget buildAlert(BuildContext context) {
+    return Container(
+      width: double.infinity,
+      alignment: Alignment.center,
+      padding: const EdgeInsets.all(24),
+      decoration: BoxDecoration(
+        color: ColorsTheme.of(context).cardBackground,
+        borderRadius: const BorderRadius.all(Radius.zero),
+      ),
+      child: Column(
+        children: [
+          Container(
+              width: 72,
+              height: 72,
+              padding: const EdgeInsets.all(8),
+              decoration: BoxDecoration(
+                shape: BoxShape.circle,
+                color: themeColor(context: context),
+              ),
+              child: getIcon(context)),
+          const SizedBox(height: 12),
+          Text(
+            FlutterI18n.translate(context,
+                    'make_sure_you_have_stored_your_keys_correctly_in_your_x')
+                .replaceFirst(
+                    '{0}', FlutterI18n.translate(context, 'google_drive')),
+            style: FontTheme.of(context).body1().copyWith(
+                  fontWeight: FontWeight.w500,
+                  color: ColorsTheme.of(context).textPrimary,
+                ),
+            textAlign: TextAlign.center,
+          ),
+        ],
+      ),
+    );
+  }
+
+  @override
+  Widget? buildFooter(BuildContext context, WidgetRef ref) =>
+      MxcButton.primaryWhite(
+        key: const ValueKey('storeButton'),
+        title: FlutterI18n.translate(context, 'store_in_x').replaceFirst(
+            '{0}', FlutterI18n.translate(context, 'google_drive')),
+        titleColor: ColorsTheme.of(context).textBlack200,
+        titleSize: 18,
+        onTap: () => ref.read(presenter).storeAndProceed(),
+        edgeType: MXCWalletButtonEdgeType.hard,
+      );
+}
diff --git a/lib/features/splash/secure_recovery_phrase/presentation/google_drive_recovery_phrase_alert/google_drive_recovery_phrase_presenter.dart b/lib/features/splash/secure_recovery_phrase/presentation/google_drive_recovery_phrase_alert/google_drive_recovery_phrase_presenter.dart
new file mode 100644
index 00000000..3e744423
--- /dev/null
+++ b/lib/features/splash/secure_recovery_phrase/presentation/google_drive_recovery_phrase_alert/google_drive_recovery_phrase_presenter.dart
@@ -0,0 +1,18 @@
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
+
+import 'google_drive_recovery_phrase_state.dart';
+
+final googleDriveRecoveryPhraseContainer = PresenterContainer<
+    GoogleDriveRecoveryPhrasePresenter,
+    GoogleDriveRecoveryPhraseState>(() => GoogleDriveRecoveryPhrasePresenter());
+
+class GoogleDriveRecoveryPhrasePresenter
+    extends RecoveryPhraseBasePresenter<GoogleDriveRecoveryPhraseState> {
+  GoogleDriveRecoveryPhrasePresenter()
+      : super(GoogleDriveRecoveryPhraseState());
+
+  void storeAndProceed() {}
+
+  void saveToGoogleDrive() {}
+}
diff --git a/lib/features/splash/secure_recovery_phrase/presentation/google_drive_recovery_phrase_alert/google_drive_recovery_phrase_state.dart b/lib/features/splash/secure_recovery_phrase/presentation/google_drive_recovery_phrase_alert/google_drive_recovery_phrase_state.dart
new file mode 100644
index 00000000..e1158bbf
--- /dev/null
+++ b/lib/features/splash/secure_recovery_phrase/presentation/google_drive_recovery_phrase_alert/google_drive_recovery_phrase_state.dart
@@ -0,0 +1,10 @@
+import 'package:equatable/equatable.dart';
+import 'package:moonchain_wallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
+
+class GoogleDriveRecoveryPhraseState extends RecoveryPhraseBaseState
+    with EquatableMixin {
+  @override
+  List<Object?> get props => [
+        super.props,
+      ];
+}
diff --git a/lib/features/splash/secure_recovery_phrase/presentation/icloud_recovery_phrase_alert/icloud_recovery_phrase_alert.dart b/lib/features/splash/secure_recovery_phrase/presentation/icloud_recovery_phrase_alert/icloud_recovery_phrase_alert.dart
new file mode 100644
index 00000000..66875477
--- /dev/null
+++ b/lib/features/splash/secure_recovery_phrase/presentation/icloud_recovery_phrase_alert/icloud_recovery_phrase_alert.dart
@@ -0,0 +1,3 @@
+export 'icloud_recovery_phrase_page.dart';
+export 'icloud_recovery_phrase_presenter.dart';
+export 'icloud_recovery_phrase_state.dart';
\ No newline at end of file
diff --git a/lib/features/splash/secure_recovery_phrase/presentation/icloud_recovery_phrase_alert/icloud_recovery_phrase_page.dart b/lib/features/splash/secure_recovery_phrase/presentation/icloud_recovery_phrase_alert/icloud_recovery_phrase_page.dart
new file mode 100644
index 00000000..e864e0d6
--- /dev/null
+++ b/lib/features/splash/secure_recovery_phrase/presentation/icloud_recovery_phrase_alert/icloud_recovery_phrase_page.dart
@@ -0,0 +1,85 @@
+import 'package:moonchain_wallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_i18n/flutter_i18n.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:mxc_ui/mxc_ui.dart';
+
+class ICloudRecoveryPhrasePage extends RecoveryPhraseBasePage {
+  const ICloudRecoveryPhrasePage({
+    Key? key,
+    this.settingsFlow = false,
+  }) : super(key: key);
+
+  final bool settingsFlow;
+
+  @override
+  ProviderBase<ICloudRecoveryPhrasePresenter> get presenter =>
+      iCloudRecoveryPhraseContainer.actions;
+
+  @override
+  ProviderBase<ICloudRecoveryPhraseState> get state =>
+      iCloudRecoveryPhraseContainer.state;
+
+  @override
+  Widget icon(BuildContext context) => getIcon(context);
+
+  @override
+  Color themeColor({BuildContext? context}) => ColorsTheme.of(context!).white;
+
+  Widget getIcon(BuildContext context) {
+    return Icon(
+      MxcIcons.icloud,
+      color: ColorsTheme.of(context).blackDeep,
+      size: 42,
+    );
+  }
+
+  @override
+  Widget buildAlert(BuildContext context) {
+    return Container(
+      width: double.infinity,
+      alignment: Alignment.center,
+      padding: const EdgeInsets.all(24),
+      decoration: BoxDecoration(
+        color: ColorsTheme.of(context).cardBackground,
+        borderRadius: const BorderRadius.all(Radius.zero),
+      ),
+      child: Column(
+        children: [
+          Container(
+              width: 72,
+              height: 72,
+              padding: const EdgeInsets.all(8),
+              decoration: BoxDecoration(
+                borderRadius: const BorderRadius.all(Radius.circular(16)),
+                color: themeColor(context: context),
+              ),
+              child: getIcon(context)),
+          const SizedBox(height: 12),
+          Text(
+            FlutterI18n.translate(context,
+                    'make_sure_you_have_stored_your_keys_correctly_in_your_x')
+                .replaceFirst('{0}', FlutterI18n.translate(context, 'icloud')),
+            style: FontTheme.of(context).body1().copyWith(
+                  fontWeight: FontWeight.w500,
+                  color: ColorsTheme.of(context).textPrimary,
+                ),
+            textAlign: TextAlign.center,
+          ),
+        ],
+      ),
+    );
+  }
+
+  @override
+  Widget? buildFooter(BuildContext context, WidgetRef ref) =>
+      MxcButton.primaryWhite(
+        key: const ValueKey('storeButton'),
+        title: FlutterI18n.translate(context, 'store_in_x')
+            .replaceFirst('{0}', FlutterI18n.translate(context, 'icloud')),
+        titleColor: ColorsTheme.of(context).textBlack200,
+        titleSize: 18,
+        onTap: () => ref.read(presenter).storeAndProceed(),
+        edgeType: MXCWalletButtonEdgeType.hard,
+      );
+}
diff --git a/lib/features/splash/secure_recovery_phrase/presentation/icloud_recovery_phrase_alert/icloud_recovery_phrase_presenter.dart b/lib/features/splash/secure_recovery_phrase/presentation/icloud_recovery_phrase_alert/icloud_recovery_phrase_presenter.dart
new file mode 100644
index 00000000..fcc575ee
--- /dev/null
+++ b/lib/features/splash/secure_recovery_phrase/presentation/icloud_recovery_phrase_alert/icloud_recovery_phrase_presenter.dart
@@ -0,0 +1,17 @@
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
+
+import 'icloud_recovery_phrase_state.dart';
+
+final iCloudRecoveryPhraseContainer = PresenterContainer<
+    ICloudRecoveryPhrasePresenter,
+    ICloudRecoveryPhraseState>(() => ICloudRecoveryPhrasePresenter());
+
+class ICloudRecoveryPhrasePresenter
+    extends RecoveryPhraseBasePresenter<ICloudRecoveryPhraseState> {
+  ICloudRecoveryPhrasePresenter() : super(ICloudRecoveryPhraseState());
+
+  void storeAndProceed() {}
+
+  void saveToGoogleDrive() {}
+}
diff --git a/lib/features/splash/secure_recovery_phrase/presentation/icloud_recovery_phrase_alert/icloud_recovery_phrase_state.dart b/lib/features/splash/secure_recovery_phrase/presentation/icloud_recovery_phrase_alert/icloud_recovery_phrase_state.dart
new file mode 100644
index 00000000..c8eee1f5
--- /dev/null
+++ b/lib/features/splash/secure_recovery_phrase/presentation/icloud_recovery_phrase_alert/icloud_recovery_phrase_state.dart
@@ -0,0 +1,10 @@
+import 'package:equatable/equatable.dart';
+import 'package:moonchain_wallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
+
+class ICloudRecoveryPhraseState extends RecoveryPhraseBaseState
+    with EquatableMixin {
+  @override
+  List<Object?> get props => [
+        super.props,
+      ];
+}
diff --git a/lib/features/splash/secure_recovery_phrase/presentation/local_seed_phrase_alert/local_recovery_phrase_page.dart b/lib/features/splash/secure_recovery_phrase/presentation/local_seed_phrase_alert/local_recovery_phrase_page.dart
index 58ca6c00..941fb0a6 100644
--- a/lib/features/splash/secure_recovery_phrase/presentation/local_seed_phrase_alert/local_recovery_phrase_page.dart
+++ b/lib/features/splash/secure_recovery_phrase/presentation/local_seed_phrase_alert/local_recovery_phrase_page.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
+import 'package:moonchain_wallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -82,5 +82,6 @@ class LocalRecoveryPhrasePage extends RecoveryPhraseBasePage {
         onTap: () => ref.read(presenter).saveLocally(
               settingsFlow,
             ),
+        edgeType: MXCWalletButtonEdgeType.hard,
       );
 }
diff --git a/lib/features/splash/secure_recovery_phrase/presentation/local_seed_phrase_alert/local_recovery_phrase_presenter.dart b/lib/features/splash/secure_recovery_phrase/presentation/local_seed_phrase_alert/local_recovery_phrase_presenter.dart
index 10f53451..309fd581 100644
--- a/lib/features/splash/secure_recovery_phrase/presentation/local_seed_phrase_alert/local_recovery_phrase_presenter.dart
+++ b/lib/features/splash/secure_recovery_phrase/presentation/local_seed_phrase_alert/local_recovery_phrase_presenter.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
 
 import 'local_recovery_phrase_state.dart';
 
diff --git a/lib/features/splash/secure_recovery_phrase/presentation/local_seed_phrase_alert/local_recovery_phrase_state.dart b/lib/features/splash/secure_recovery_phrase/presentation/local_seed_phrase_alert/local_recovery_phrase_state.dart
index 8ffe503d..2a610cca 100644
--- a/lib/features/splash/secure_recovery_phrase/presentation/local_seed_phrase_alert/local_recovery_phrase_state.dart
+++ b/lib/features/splash/secure_recovery_phrase/presentation/local_seed_phrase_alert/local_recovery_phrase_state.dart
@@ -1,5 +1,5 @@
 import 'package:equatable/equatable.dart';
-import 'package:datadashwallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
+import 'package:moonchain_wallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
 
 class LocalRecoveryPhraseState extends RecoveryPhraseBaseState
     with EquatableMixin {
diff --git a/lib/features/splash/secure_recovery_phrase/presentation/recovery_phrase_base/recovery_phrase_base_page.dart b/lib/features/splash/secure_recovery_phrase/presentation/recovery_phrase_base/recovery_phrase_base_page.dart
index bd967a17..f233eb86 100644
--- a/lib/features/splash/secure_recovery_phrase/presentation/recovery_phrase_base/recovery_phrase_base_page.dart
+++ b/lib/features/splash/secure_recovery_phrase/presentation/recovery_phrase_base/recovery_phrase_base_page.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:mxc_ui/mxc_ui.dart';
@@ -38,23 +38,30 @@ abstract class RecoveryPhraseBasePage extends HookConsumerWidget {
 
   Widget? buildAccept(BuildContext context, WidgetRef ref) => null;
 
+  Widget? buildEmailInput(BuildContext context, WidgetRef ref) => null;
+
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final acceptComponent = buildAccept(context, ref);
 
     return MxcPage(
-      layout: LayoutType.column,
+      layout: LayoutType.scrollable,
       useSplashBackground: true,
       childrenPadding: const EdgeInsets.symmetric(horizontal: 24),
       presenter: ref.watch(presenter),
       appBar: buildAppBar(context, ref),
       footer: buildFooter(context, ref),
+      resizeToAvoidBottomInset: true,
       children: [
         buildAppLogo(context),
-        const Spacer(),
+        const SizedBox(height: 120),
         buildAlert(context),
-        const Spacer(),
+        if (buildEmailInput(context, ref) != null) ...[
+          const SizedBox(height: 18),
+          buildEmailInput(context, ref)!,
+        ],
         if (acceptComponent != null) ...[
+          const SizedBox(height: 130),
           acceptComponent,
           const SizedBox(height: 16),
         ]
diff --git a/lib/features/splash/secure_recovery_phrase/presentation/recovery_phrase_base/recovery_phrase_base_presenter.dart b/lib/features/splash/secure_recovery_phrase/presentation/recovery_phrase_base/recovery_phrase_base_presenter.dart
index b19afe59..39bdd194 100644
--- a/lib/features/splash/secure_recovery_phrase/presentation/recovery_phrase_base/recovery_phrase_base_presenter.dart
+++ b/lib/features/splash/secure_recovery_phrase/presentation/recovery_phrase_base/recovery_phrase_base_presenter.dart
@@ -1,10 +1,10 @@
 import 'dart:io';
 
 import 'package:appinio_social_share/appinio_social_share.dart';
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
-import 'package:datadashwallet/features/splash/splash.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
+import 'package:moonchain_wallet/features/splash/splash.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mailer/flutter_mailer.dart';
 import 'package:intl/intl.dart';
@@ -103,7 +103,11 @@ abstract class RecoveryPhraseBasePresenter<T extends RecoveryPhraseBaseState>
     nextProcess(settingsFlow, res['phrases']);
   }
 
-  void sendEmail(BuildContext ctx, bool settingsFlow) async {
+  void sendEmail(
+    BuildContext ctx,
+    bool settingsFlow,
+    String userEmail,
+  ) async {
     final res = await generateMnemonicFile(settingsFlow);
 
     final email = MailOptions(
@@ -111,6 +115,7 @@ abstract class RecoveryPhraseBasePresenter<T extends RecoveryPhraseBaseState>
       subject: translate('email_secured_subject')!,
       attachments: [res['filePath']],
       isHTML: false,
+      recipients: [userEmail],
     );
 
     try {
diff --git a/lib/features/splash/secure_recovery_phrase/presentation/telegram_recovery_phrase_alert/telegram_recovery_phrase_page.dart b/lib/features/splash/secure_recovery_phrase/presentation/telegram_recovery_phrase_alert/telegram_recovery_phrase_page.dart
index 94a9bd8b..4d518783 100644
--- a/lib/features/splash/secure_recovery_phrase/presentation/telegram_recovery_phrase_alert/telegram_recovery_phrase_page.dart
+++ b/lib/features/splash/secure_recovery_phrase/presentation/telegram_recovery_phrase_alert/telegram_recovery_phrase_page.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
+import 'package:moonchain_wallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
@@ -44,9 +44,8 @@ class TelegramRecoveryPhrasePage extends RecoveryPhraseBasePage {
         Container(
           decoration: const BoxDecoration(
             color: Color(0xFF527DA3),
-            borderRadius: BorderRadius.only(
-              topLeft: Radius.circular(10),
-              topRight: Radius.circular(10),
+            borderRadius: BorderRadius.all(
+              Radius.zero,
             ),
           ),
           child: Column(children: [
@@ -111,16 +110,15 @@ class TelegramRecoveryPhrasePage extends RecoveryPhraseBasePage {
           height: 80,
           decoration: const BoxDecoration(
             color: Colors.white,
-            borderRadius: BorderRadius.only(
-              bottomLeft: Radius.circular(10),
-              bottomRight: Radius.circular(10),
+            borderRadius: BorderRadius.all(
+              Radius.zero,
             ),
           ),
           child: ScaleAnimation(
             child: Container(
               decoration: const BoxDecoration(
                 color: Colors.white,
-                borderRadius: BorderRadius.all(Radius.circular(10)),
+                borderRadius: BorderRadius.all(Radius.zero),
               ),
               child: Padding(
                   padding: const EdgeInsets.symmetric(horizontal: 18),
@@ -174,15 +172,15 @@ class TelegramRecoveryPhrasePage extends RecoveryPhraseBasePage {
       );
 
   @override
-  Widget? buildFooter(BuildContext context, WidgetRef ref) => MxcButton.primary(
+  Widget? buildFooter(BuildContext context, WidgetRef ref) =>
+      MxcButton.primaryWhite(
         key: const ValueKey('storeButton'),
         title: FlutterI18n.translate(context, 'store_to')
             .replaceFirst('{0}', name(context)),
         titleColor: ColorsTheme.of(context).textBlack200,
-        color: themeColor(),
-        borderColor: themeColor(),
         onTap: ref.watch(state).acceptAgreement
             ? () => ref.read(presenter).shareToTelegram(settingsFlow)
             : null,
+        edgeType: MXCWalletButtonEdgeType.hard,
       );
 }
diff --git a/lib/features/splash/secure_recovery_phrase/presentation/telegram_recovery_phrase_alert/telegram_recovery_phrase_presenter.dart b/lib/features/splash/secure_recovery_phrase/presentation/telegram_recovery_phrase_alert/telegram_recovery_phrase_presenter.dart
index 1a567b83..aa2a428c 100644
--- a/lib/features/splash/secure_recovery_phrase/presentation/telegram_recovery_phrase_alert/telegram_recovery_phrase_presenter.dart
+++ b/lib/features/splash/secure_recovery_phrase/presentation/telegram_recovery_phrase_alert/telegram_recovery_phrase_presenter.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
 
 import 'telegram_recovery_phrase_state.dart';
 
diff --git a/lib/features/splash/secure_recovery_phrase/presentation/telegram_recovery_phrase_alert/telegram_recovery_phrase_state.dart b/lib/features/splash/secure_recovery_phrase/presentation/telegram_recovery_phrase_alert/telegram_recovery_phrase_state.dart
index fa3027dd..3e58ee16 100644
--- a/lib/features/splash/secure_recovery_phrase/presentation/telegram_recovery_phrase_alert/telegram_recovery_phrase_state.dart
+++ b/lib/features/splash/secure_recovery_phrase/presentation/telegram_recovery_phrase_alert/telegram_recovery_phrase_state.dart
@@ -1,5 +1,5 @@
 import 'package:equatable/equatable.dart';
-import 'package:datadashwallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
+import 'package:moonchain_wallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
 
 class TelegramRecoveryPhrasetState extends RecoveryPhraseBaseState
     with EquatableMixin {
diff --git a/lib/features/splash/secure_recovery_phrase/presentation/wechat_recovery_phrase_alert/wechat_recovery_phrase_page.dart b/lib/features/splash/secure_recovery_phrase/presentation/wechat_recovery_phrase_alert/wechat_recovery_phrase_page.dart
index a7aba134..b89f7e30 100644
--- a/lib/features/splash/secure_recovery_phrase/presentation/wechat_recovery_phrase_alert/wechat_recovery_phrase_page.dart
+++ b/lib/features/splash/secure_recovery_phrase/presentation/wechat_recovery_phrase_alert/wechat_recovery_phrase_page.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
@@ -154,15 +154,15 @@ class WechatRecoveryPhrasePage extends RecoveryPhraseBasePage {
       );
 
   @override
-  Widget? buildFooter(BuildContext context, WidgetRef ref) => MxcButton.primary(
+  Widget? buildFooter(BuildContext context, WidgetRef ref) =>
+      MxcButton.primaryWhite(
         key: const ValueKey('storeButton'),
         title: FlutterI18n.translate(context, 'store_to')
             .replaceFirst('{0}', name(context)),
         titleColor: ColorsTheme.of(context).textBlack200,
-        color: themeColor(),
-        borderColor: themeColor(),
         onTap: ref.watch(state).acceptAgreement
             ? () => ref.read(presenter).shareToWechat(settingsFlow)
             : null,
+        edgeType: MXCWalletButtonEdgeType.hard,
       );
 }
diff --git a/lib/features/splash/secure_recovery_phrase/presentation/wechat_recovery_phrase_alert/wechat_recovery_phrase_presenter.dart b/lib/features/splash/secure_recovery_phrase/presentation/wechat_recovery_phrase_alert/wechat_recovery_phrase_presenter.dart
index 52a5e476..4bfc530e 100644
--- a/lib/features/splash/secure_recovery_phrase/presentation/wechat_recovery_phrase_alert/wechat_recovery_phrase_presenter.dart
+++ b/lib/features/splash/secure_recovery_phrase/presentation/wechat_recovery_phrase_alert/wechat_recovery_phrase_presenter.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
 
 import 'wechat_recovery_phrase_state.dart';
 
diff --git a/lib/features/splash/secure_recovery_phrase/presentation/wechat_recovery_phrase_alert/wechat_recovery_phrase_state.dart b/lib/features/splash/secure_recovery_phrase/presentation/wechat_recovery_phrase_alert/wechat_recovery_phrase_state.dart
index 529eb8d8..b6ff40cc 100644
--- a/lib/features/splash/secure_recovery_phrase/presentation/wechat_recovery_phrase_alert/wechat_recovery_phrase_state.dart
+++ b/lib/features/splash/secure_recovery_phrase/presentation/wechat_recovery_phrase_alert/wechat_recovery_phrase_state.dart
@@ -1,5 +1,5 @@
 import 'package:equatable/equatable.dart';
-import 'package:datadashwallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
+import 'package:moonchain_wallet/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart';
 
 class WechatRecoveryPhrasetState extends RecoveryPhraseBaseState
     with EquatableMixin {
diff --git a/lib/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart b/lib/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart
index 648cb34f..7fd9972a 100644
--- a/lib/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart
+++ b/lib/features/splash/secure_recovery_phrase/secure_recovery_phrase.dart
@@ -7,4 +7,7 @@ export 'presentation/wechat_recovery_phrase_alert/wechat_recovery_phrase_page.da
 export 'presentation/email_recovery_phrase_alert/email_recovery_phrase_page.dart';
 export 'presentation/local_seed_phrase_alert/local_recovery_phrase_page.dart';
 
+export 'presentation/google_drive_recovery_phrase_alert/google_drive_recovery_phrase_alert.dart';
+export 'presentation/icloud_recovery_phrase_alert/icloud_recovery_phrase_alert.dart';
+
 export 'presentation/widgets/scale_animation.dart';
diff --git a/lib/features/splash/security_notice/security_notice_page.dart b/lib/features/splash/security_notice/security_notice_page.dart
index 3b1f7d84..65dbe31b 100644
--- a/lib/features/splash/security_notice/security_notice_page.dart
+++ b/lib/features/splash/security_notice/security_notice_page.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:flutter_svg/flutter_svg.dart';
@@ -25,10 +25,11 @@ class SecurityNoticePage extends HookConsumerWidget {
       footer: Padding(
         padding: const EdgeInsets.symmetric(horizontal: 24),
         child: MxcButton.primaryWhite(
-          key: const Key('confrimButton'),
+          key: const Key('storedMyKeyButton'),
           title: FlutterI18n.translate(context, 'stored_my_key'),
-          size: AxsButtonSize.xl,
+          size: MXCWalletButtonSize.xl,
           onTap: () => presenter.confirm(),
+          edgeType: UIConfig.splashScreensButtonsEdgeType,
         ),
       ),
       children: [
diff --git a/lib/features/splash/security_notice/security_notice_presenter.dart b/lib/features/splash/security_notice/security_notice_presenter.dart
index 4d821668..7e6611f8 100644
--- a/lib/features/splash/security_notice/security_notice_presenter.dart
+++ b/lib/features/splash/security_notice/security_notice_presenter.dart
@@ -1,6 +1,6 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/security/presentation/passcode.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/security/presentation/passcode.dart';
 
 import 'security_notice_state.dart';
 
diff --git a/lib/features/splash/setup_wallet/setup_wallet_page.dart b/lib/features/splash/setup_wallet/setup_wallet_page.dart
index b3704a51..8e44625d 100644
--- a/lib/features/splash/setup_wallet/setup_wallet_page.dart
+++ b/lib/features/splash/setup_wallet/setup_wallet_page.dart
@@ -1,11 +1,12 @@
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/splash/splash.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/splash/splash.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:lottie/lottie.dart';
+import 'package:moonchain_wallet/main.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 
 import 'setup_wallet_presenter.dart';
@@ -32,14 +33,14 @@ class SplashSetupWalletPage extends SplashBasePage {
   Widget appLogo(BuildContext context) {
     return SizedBox(
       width: MediaQuery.of(context).size.width,
-      child: Center(
-        child: SizedBox(
-          width: 200,
-          child: LottieBuilder.asset(
-            'assets/lottie/axs_logo_animation.json',
-            repeat: false,
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.center,
+        children: [
+          Text(
+            appName,
+            style: FontTheme.of(context).logo(),
           ),
-        ),
+        ],
       ),
     );
   }
@@ -59,6 +60,8 @@ class SplashSetupWalletPage extends SplashBasePage {
               const SplashStoragePage(),
             ),
           ),
+          edgeType: UIConfig.splashScreensButtonsEdgeType,
+          size: MXCWalletButtonSize.xxl,
         ),
         MxcButton.plainWhite(
           key: const ValueKey('importButton'),
diff --git a/lib/features/splash/setup_wallet/setup_wallet_presenter.dart b/lib/features/splash/setup_wallet/setup_wallet_presenter.dart
index 6da4a10e..ef091730 100644
--- a/lib/features/splash/setup_wallet/setup_wallet_presenter.dart
+++ b/lib/features/splash/setup_wallet/setup_wallet_presenter.dart
@@ -1,5 +1,5 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/splash/splash.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/splash/splash.dart';
 import 'package:flutter/material.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
@@ -57,6 +57,6 @@ class SplashSetupWalletPresenter
   }
 
   void launchAxsTermsConditions() {
-    _launcherUseCase.launchAxsTermsConditions();
+    _launcherUseCase.launchMXCWalletTermsConditions();
   }
 }
diff --git a/lib/features/splash/setup_wallet/setup_wallet_state.dart b/lib/features/splash/setup_wallet/setup_wallet_state.dart
index b4180852..836a9e36 100644
--- a/lib/features/splash/setup_wallet/setup_wallet_state.dart
+++ b/lib/features/splash/setup_wallet/setup_wallet_state.dart
@@ -1,5 +1,5 @@
 import 'package:equatable/equatable.dart';
-import 'package:datadashwallet/features/splash/splash.dart';
+import 'package:moonchain_wallet/features/splash/splash.dart';
 
 class SplashSetupWalletState extends SplashBaseState with EquatableMixin {
   @override
diff --git a/lib/features/splash/splash.dart b/lib/features/splash/splash.dart
index 97d47e23..2541d087 100644
--- a/lib/features/splash/splash.dart
+++ b/lib/features/splash/splash.dart
@@ -1,5 +1,6 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/splash/mns_process/mns.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/splash/mns_process/mns.dart';
+import 'wallet_creation_notice/wallet_creation_notice.dart';
 import 'package:flutter/material.dart';
 
 import 'security_notice/security_notice_page.dart';
@@ -14,6 +15,7 @@ export 'create_storage/presentation/create_storage_presenter.dart';
 export 'setup_wallet/setup_wallet_page.dart';
 export 'import_storage/import_storage_page.dart';
 export 'import_wallet/import_wallet_page.dart';
+export 'wallet_creation_notice/wallet_creation_notice.dart';
 
 Future<void> pushSecurityNoticePage(BuildContext context) {
   return Navigator.of(context).push(
@@ -30,3 +32,11 @@ Future<void> pushMNSAnnouncementPage(BuildContext context) {
     ),
   );
 }
+
+Future<void> pushWalletCreationNoticePage(BuildContext context) {
+  return Navigator.of(context).replaceAll(
+    route(
+      const WalletCreationNoticePage(),
+    ),
+  );
+}
diff --git a/lib/features/splash/splash_base/splash_base_page.dart b/lib/features/splash/splash_base/splash_base_page.dart
index 61a63f31..b8b651a2 100644
--- a/lib/features/splash/splash_base/splash_base_page.dart
+++ b/lib/features/splash/splash_base/splash_base_page.dart
@@ -1,8 +1,10 @@
 import 'dart:io';
 
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:moonchain_wallet/main.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 import 'splash_base_presenter.dart';
 import 'splash_base_state.dart';
@@ -42,13 +44,9 @@ abstract class SplashBasePage extends HookConsumerWidget {
   Widget? buildFooter(BuildContext context, WidgetRef ref) => null;
 
   Widget appLogo(BuildContext context) {
-    return Column(
-      mainAxisAlignment: MainAxisAlignment.end,
-      children: [
-        Image(
-          image: ImagesTheme.of(context).axsWithTitle,
-        ),
-      ],
+    return Text(
+      appName,
+      style: FontTheme.of(context).logo(),
     );
   }
 
@@ -66,43 +64,25 @@ abstract class SplashBasePage extends HookConsumerWidget {
     ) {
       return Expanded(
         child: Stack(fit: StackFit.expand, children: [
-          Positioned(top: 40, child: appLogo(context)),
-          FutureBuilder(
-            future: Future.delayed(const Duration(seconds: 4)),
-            builder: (context, snapshot) {
-              if (snapshot.connectionState == ConnectionState.waiting) {
-                // Return an empty container while waiting for the delay
-                return AnimatedPositioned(
-                  duration: const Duration(milliseconds: 4000),
-                  curve: Curves.easeInOut,
-                  bottom: splashState.animate
-                      ? Platform.isAndroid
-                          ? 16
-                          : 0
-                      : -600,
-                  child: SizedBox(
-                      width: MediaQuery.of(context).size.width,
-                      child: Container(
-                          padding: const EdgeInsets.symmetric(horizontal: 24),
-                          child: buildFooter(context, ref)!)),
-                );
-              } else {
-                return AnimatedPositioned(
-                  duration: const Duration(milliseconds: 4000),
-                  curve: Curves.easeInOut,
-                  bottom: splashState.animate
-                      ? Platform.isAndroid
-                          ? 16
-                          : 0
-                      : -600,
-                  child: SizedBox(
-                      width: MediaQuery.of(context).size.width,
-                      child: Container(
-                          padding: const EdgeInsets.symmetric(horizontal: 24),
-                          child: buildFooter(context, ref)!)),
-                );
-              }
-            },
+          AnimatedPositioned(
+            duration: const Duration(milliseconds: 2000),
+            curve: Curves.easeInOut,
+            top: splashState.animate ? 175 : MediaQuery.of(context).size.height + 600,
+            child: appLogo(context),
+          ),
+          AnimatedPositioned(
+            duration: const Duration(milliseconds: 3000),
+            curve: Curves.easeInOut,
+            bottom: splashState.animate
+                ? Platform.isAndroid
+                    ? 16
+                    : 0
+                : -600,
+            child: SizedBox(
+                width: MediaQuery.of(context).size.width,
+                child: Container(
+                    padding: const EdgeInsets.symmetric(horizontal: 24),
+                    child: buildFooter(context, ref)!)),
           ),
         ]),
       );
@@ -119,9 +99,9 @@ abstract class SplashBasePage extends HookConsumerWidget {
         if (drawAnimated == true)
           buildAnimatedLayout(context)!
         else ...[
-          const SizedBox(height: 40),
+          const SizedBox(height: 130),
           appLogo(context),
-          const SizedBox(height: 48),
+          const SizedBox(height: Sizes.space4XLarge),
           Expanded(
             child: Column(
               children: getButtons(context, ref),
diff --git a/lib/features/splash/wallet_creation_notice/wallet_creation_notice.dart b/lib/features/splash/wallet_creation_notice/wallet_creation_notice.dart
new file mode 100644
index 00000000..f05e2235
--- /dev/null
+++ b/lib/features/splash/wallet_creation_notice/wallet_creation_notice.dart
@@ -0,0 +1,2 @@
+export 'wallet_creation_notice_page.dart';
+export 'wallet_creation_notice_presenter.dart';
diff --git a/lib/features/splash/wallet_creation_notice/wallet_creation_notice_page.dart b/lib/features/splash/wallet_creation_notice/wallet_creation_notice_page.dart
new file mode 100644
index 00000000..2aab42f0
--- /dev/null
+++ b/lib/features/splash/wallet_creation_notice/wallet_creation_notice_page.dart
@@ -0,0 +1,136 @@
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_i18n/flutter_i18n.dart';
+import 'package:flutter_svg/svg.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:moonchain_wallet/main.dart';
+import 'package:mxc_ui/mxc_ui.dart';
+
+import 'wallet_creation_notice_presenter.dart';
+
+const countDown = 5;
+
+class WalletCreationNoticePage extends HookConsumerWidget {
+  const WalletCreationNoticePage({
+    Key? key,
+  }) : super(key: key);
+
+  Stream<int> countdownStream(int start) async* {
+    for (int i = start; i >= 0; i--) {
+      yield i;
+      await Future.delayed(const Duration(seconds: 1));
+    }
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final presenter = ref.watch(walletCreationNoticeContainer.actions);
+
+    return MxcPage(
+      layout: LayoutType.column,
+      presenter: presenter,
+      useSplashBackground: true,
+      childrenPadding: const EdgeInsets.symmetric(horizontal: 24),
+
+      // footer: Column(
+      //   mainAxisAlignment: MainAxisAlignment.end,
+      //   children: [
+      //     MxcButton.plainWhite(
+      //       key: const ValueKey('continueNow'),
+      //       title: FlutterI18n.translate(context, 'continue_now'),
+      //       onTap: () => presenter.continueNow(),
+      //       edgeType: UIConfig.securityScreensButtonsEdgeType,
+      //     ),
+      //   ],
+      // ),
+      children: [
+        const SizedBox(height: 200),
+        Text(
+          appName,
+          style: FontTheme.of(context).logo(),
+        ),
+        const SizedBox(
+          height: 30,
+        ),
+        Container(
+          padding: const EdgeInsets.symmetric(vertical: 5),
+          decoration: BoxDecoration(
+              color: ColorsTheme.of(context).white,
+              borderRadius: UIConfig.defaultBorderRadiusAll),
+          key: const ValueKey('accountSetupComplete'),
+          child: Center(
+              child: Text(
+            FlutterI18n.translate(context, 'account_setup_complete'),
+            style: FontTheme.of(context)
+                .body2()
+                .copyWith(color: ColorsTheme.of(context).blackDeep),
+          )),
+        ),
+        // Padding(
+        //   padding: const EdgeInsets.symmetric(vertical: 16),
+        //   child: Text(
+        //     FlutterI18n.translate(context, 'protect_your_wallet'),
+        //     style: FontTheme.of(context).h4.white(),
+        //   ),
+        // ),
+        const SizedBox(
+          height: 30,
+        ),
+        Text(
+          FlutterI18n.translate(
+              context, 'you_will_be_directed_to_the_main_app'),
+          style: FontTheme.of(context).h6.white(),
+          textAlign: TextAlign.center,
+        ),
+        const SizedBox(
+          height: 100,
+        ),
+        Text(
+          FlutterI18n.translate(context, 'entering_the_app'),
+          style: FontTheme.of(context).body2.white(),
+          textAlign: TextAlign.center,
+        ),
+        const SizedBox(
+          height: Sizes.spaceNormal,
+        ),
+        StreamBuilder(
+          stream: countdownStream(countDown),
+          builder: (context, snapshot) {
+            final remainingTime = snapshot.data ?? countDown;
+            final progress = remainingTime / countDown;
+            if (snapshot.data == 0) {
+              Future.delayed(
+                const Duration(seconds: 1),
+                () => presenter.continueNow(context),
+              );
+            }
+            return Column(
+              children: [
+                CircularProgressIndicator(
+                  value: progress,
+                  color: ColorsTheme.of(context).white,
+                  backgroundColor: const Color(0XFF313131),
+                ),
+                const SizedBox(
+                  height: Sizes.spaceNormal,
+                ),
+                Text(
+                  FlutterI18n.translate(context, 'in ${snapshot.data ?? 0}'),
+                  style: FontTheme.of(context).body2.white(),
+                  textAlign: TextAlign.center,
+                )
+              ],
+            );
+          },
+        ),
+        const Spacer(),
+        MxcButton.plainWhite(
+          key: const ValueKey('continueNow'),
+          title: FlutterI18n.translate(context, 'continue_now'),
+          onTap: () => presenter.continueNow(context),
+          edgeType: UIConfig.securityScreensButtonsEdgeType,
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/features/splash/wallet_creation_notice/wallet_creation_notice_presenter.dart b/lib/features/splash/wallet_creation_notice/wallet_creation_notice_presenter.dart
new file mode 100644
index 00000000..75ede699
--- /dev/null
+++ b/lib/features/splash/wallet_creation_notice/wallet_creation_notice_presenter.dart
@@ -0,0 +1,14 @@
+import 'package:flutter/material.dart';
+import 'package:moonchain_wallet/core/core.dart';
+
+import '../splash.dart';
+
+final walletCreationNoticeContainer =
+    PresenterContainer<WalletCreationNoticePresenter, void>(
+        () => WalletCreationNoticePresenter());
+
+class WalletCreationNoticePresenter extends CompletePresenter<void> {
+  WalletCreationNoticePresenter() : super(null);
+
+  Future<void> continueNow(BuildContext context) => pushMNSAnnouncementPage(context);
+}
diff --git a/lib/features/wallet/presentation/wallet_page.dart b/lib/features/wallet/presentation/wallet_page.dart
index 42840fc9..a1f139a6 100644
--- a/lib/features/wallet/presentation/wallet_page.dart
+++ b/lib/features/wallet/presentation/wallet_page.dart
@@ -1,13 +1,13 @@
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/common/common.dart';
-import 'package:datadashwallet/features/dapps/dapps.dart';
-import 'package:datadashwallet/features/settings/settings.dart';
-import 'package:datadashwallet/features/wallet/presentation/widgets/tweets_list.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/common/common.dart';
+import 'package:moonchain_wallet/features/dapps/dapps.dart';
+import 'package:moonchain_wallet/features/settings/settings.dart';
+import 'package:moonchain_wallet/features/wallet/presentation/widgets/tweets_list.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:datadashwallet/features/wallet/wallet.dart';
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/features/wallet/wallet.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 import 'package:mxc_ui/mxc_ui.dart';
 
@@ -30,7 +30,7 @@ class WalletPage extends HookConsumerWidget {
         useAppBar: true,
         presenter: presenter,
         resizeToAvoidBottomInset: true,
-        backgroundColor: ColorsTheme.of(context).screenBackground,
+        useGradientBackground: true,
         layout: LayoutType.column,
         useContentPadding: false,
         appBar: AppNavBar(
diff --git a/lib/features/wallet/presentation/wallet_page_presenter.dart b/lib/features/wallet/presentation/wallet_page_presenter.dart
index 612149ae..2b4dce18 100644
--- a/lib/features/wallet/presentation/wallet_page_presenter.dart
+++ b/lib/features/wallet/presentation/wallet_page_presenter.dart
@@ -1,7 +1,7 @@
 import 'dart:typed_data';
-import 'package:datadashwallet/common/components/recent_transactions/widgets/widgets.dart';
-import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/wallet/wallet.dart';
+import 'package:moonchain_wallet/common/components/recent_transactions/widgets/widgets.dart';
+import 'package:moonchain_wallet/core/core.dart';
+import 'package:moonchain_wallet/features/wallet/wallet.dart';
 import 'package:fl_chart/fl_chart.dart';
 import 'dart:convert';
 import 'package:mxc_logic/mxc_logic.dart';
diff --git a/lib/features/wallet/presentation/widgets/tweet_widget.dart b/lib/features/wallet/presentation/widgets/tweet_widget.dart
index 239cf62b..284b883d 100644
--- a/lib/features/wallet/presentation/widgets/tweet_widget.dart
+++ b/lib/features/wallet/presentation/widgets/tweet_widget.dart
@@ -93,7 +93,7 @@ class _TweetState extends State<Tweet> {
                         height: double.maxFinite,
                         width: double.maxFinite,
                         decoration: BoxDecoration(
-                          color: ColorsTheme.of(context).cardBackground,
+                          color: ColorsTheme.of(context).layerSheetBackground,
                           borderRadius:
                               const BorderRadius.all(Radius.circular(10)),
                         ),
diff --git a/lib/main.dart b/lib/main.dart
index c794d0be..a73333f9 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
-import 'package:datadashwallet/app/logger.dart';
-import 'package:datadashwallet/common/common.dart';
-import 'package:datadashwallet/core/core.dart';
+import 'package:moonchain_wallet/app/logger.dart';
+import 'package:moonchain_wallet/common/common.dart';
+import 'package:moonchain_wallet/core/core.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/material.dart';
@@ -10,15 +10,17 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 
 import 'app/app.dart';
 
+const appName = 'MOONCHAIN';
+
 @pragma('vm:entry-point')
 Future<void> _firebaseMessagingBackgroundHandler(RemoteMessage message) async {
   // If you're going to use other Firebase services in the background, such as Firestore,
   // make sure you call `initializeApp` before using other Firebase services.
   print(message.data);
   await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform);
-  await AXSNotification().setupFlutterNotifications();
+  await MoonchainWalletNotification().setupFlutterNotifications();
   // Firebase triggers notifications Itself
-  // axsNotification.showFlutterNotification(message);
+  // mxcNotification.showFlutterNotification(message);
   print('Handling a background message ${message.messageId}');
 }
 
@@ -60,7 +62,7 @@ void main() {
       runApp(
         UncontrolledProviderScope(
           container: container,
-          child: AxsWallet(
+          child: MXCWallet(
             isLoggedIn: isLoggedIn,
           ),
         ),
diff --git a/packages/ens_dart/lib/src/contracts/contracts.dart b/packages/ens_dart/lib/src/contracts/contracts.dart
index c4cdcbe5..34c7bcff 100644
--- a/packages/ens_dart/lib/src/contracts/contracts.dart
+++ b/packages/ens_dart/lib/src/contracts/contracts.dart
@@ -13,4 +13,6 @@ export 'erc_6551_account_impl.g.dart';
 export 'mep2542.g.dart'
     hide Initialized, OwnershipTransferred, ControllerChanged;
 export 'erc_6551_registry.g.dart';
-export 'doit/doit.dart';
\ No newline at end of file
+export 'doit/doit.dart';
+export 'erc721.g.dart';
+export 'storage.g.dart';
\ No newline at end of file
diff --git a/packages/ens_dart/lib/src/contracts/erc721.g.dart b/packages/ens_dart/lib/src/contracts/erc721.g.dart
new file mode 100644
index 00000000..cf4038f1
--- /dev/null
+++ b/packages/ens_dart/lib/src/contracts/erc721.g.dart
@@ -0,0 +1,1353 @@
+// Generated code, do not modify. Run `build_runner build` to re-generate!
+// @dart=2.12
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'package:web3dart/web3dart.dart' as _i1;
+import 'dart:typed_data' as _i2;
+
+final _contractAbi = _i1.ContractAbi.fromJson(
+  '[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[],"name":"ApprovalCallerNotOwnerNorApproved","type":"error"},{"inputs":[],"name":"ApprovalQueryForNonexistentToken","type":"error"},{"inputs":[],"name":"BalanceQueryForZeroAddress","type":"error"},{"inputs":[{"internalType":"uint256","name":"_size","type":"uint256"},{"internalType":"uint256","name":"_start","type":"uint256"},{"internalType":"uint256","name":"_end","type":"uint256"}],"name":"InvalidCodeAtRange","type":"error"},{"inputs":[],"name":"MintERC2309QuantityExceedsLimit","type":"error"},{"inputs":[],"name":"MintToZeroAddress","type":"error"},{"inputs":[],"name":"MintZeroQuantity","type":"error"},{"inputs":[{"internalType":"address","name":"operator","type":"address"}],"name":"OperatorNotAllowed","type":"error"},{"inputs":[],"name":"OwnerQueryForNonexistentToken","type":"error"},{"inputs":[],"name":"OwnershipNotInitializedForExtraData","type":"error"},{"inputs":[],"name":"TransferCallerNotOwnerNorApproved","type":"error"},{"inputs":[],"name":"TransferFromIncorrectOwner","type":"error"},{"inputs":[],"name":"TransferToNonERC721ReceiverImplementer","type":"error"},{"inputs":[],"name":"TransferToZeroAddress","type":"error"},{"inputs":[],"name":"URIQueryForNonexistentToken","type":"error"},{"inputs":[],"name":"WriteError","type":"error"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"owner","type":"address"},{"indexed":true,"internalType":"address","name":"approved","type":"address"},{"indexed":true,"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"Approval","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"owner","type":"address"},{"indexed":true,"internalType":"address","name":"operator","type":"address"},{"indexed":false,"internalType":"bool","name":"approved","type":"bool"}],"name":"ApprovalForAll","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"uint256","name":"fromTokenId","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"toTokenId","type":"uint256"},{"indexed":true,"internalType":"address","name":"from","type":"address"},{"indexed":true,"internalType":"address","name":"to","type":"address"}],"name":"ConsecutiveTransfer","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"previousOwner","type":"address"},{"indexed":true,"internalType":"address","name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"from","type":"address"},{"indexed":true,"internalType":"address","name":"to","type":"address"},{"indexed":true,"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"Transfer","type":"event"},{"inputs":[{"internalType":"uint256","name":"layerIndex","type":"uint256"},{"components":[{"internalType":"string","name":"name","type":"string"},{"internalType":"string","name":"mimetype","type":"string"},{"internalType":"bytes","name":"data","type":"bytes"},{"internalType":"bool","name":"hide","type":"bool"},{"internalType":"bool","name":"useExistingData","type":"bool"},{"internalType":"uint256","name":"existingDataIndex","type":"uint256"}],"internalType":"struct Indelible.TraitDTO[]","name":"traits","type":"tuple[]"}],"name":"addLayer","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"layerIndex","type":"uint256"},{"internalType":"uint256","name":"traitIndex","type":"uint256"},{"components":[{"internalType":"string","name":"name","type":"string"},{"internalType":"string","name":"mimetype","type":"string"},{"internalType":"bytes","name":"data","type":"bytes"},{"internalType":"bool","name":"hide","type":"bool"},{"internalType":"bool","name":"useExistingData","type":"bool"},{"internalType":"uint256","name":"existingDataIndex","type":"uint256"}],"internalType":"struct Indelible.TraitDTO","name":"trait","type":"tuple"}],"name":"addTrait","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"count","type":"uint256"},{"internalType":"address","name":"recipient","type":"address"}],"name":"airdrop","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"payable","type":"function"},{"inputs":[],"name":"allowListPrice","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"approve","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"address","name":"owner","type":"address"}],"name":"balanceOf","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"baseURI","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"contractData","outputs":[{"internalType":"string","name":"name","type":"string"},{"internalType":"string","name":"description","type":"string"},{"internalType":"string","name":"image","type":"string"},{"internalType":"string","name":"banner","type":"string"},{"internalType":"string","name":"website","type":"string"},{"internalType":"uint256","name":"royalties","type":"uint256"},{"internalType":"string","name":"royaltiesRecipient","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"contractURI","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"getApproved","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"layerIndex","type":"uint256"},{"internalType":"uint256","name":"traitIndex","type":"uint256"}],"name":"getLinkedTraits","outputs":[{"internalType":"uint256[]","name":"","type":"uint256[]"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"_hash","type":"string"}],"name":"hashToMetadata","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"_hash","type":"string"}],"name":"hashToSVG","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"isAllowListActive","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"owner","type":"address"},{"internalType":"address","name":"operator","type":"address"}],"name":"isApprovedForAll","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"isContractSealed","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"isMintActive","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"isOperatorFilterEnabled","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"isPublicMintActive","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"maxPerAddress","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"maxPerAllowList","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"maxSupply","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"count","type":"uint256"},{"internalType":"bytes32[]","name":"merkleProof","type":"bytes32[]"}],"name":"mint","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"payable","type":"function"},{"inputs":[],"name":"name","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"addr","type":"address"},{"internalType":"bytes32[]","name":"merkleProof","type":"bytes32[]"}],"name":"onAllowList","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"ownerOf","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"publicMintPrice","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"renounceOwnership","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"from","type":"address"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"safeTransferFrom","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"address","name":"from","type":"address"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"tokenId","type":"uint256"},{"internalType":"bytes","name":"data","type":"bytes"}],"name":"safeTransferFrom","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[],"name":"sealContract","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"price","type":"uint256"}],"name":"setAllowListPrice","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"operator","type":"address"},{"internalType":"bool","name":"approved","type":"bool"}],"name":"setApprovalForAll","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"string","name":"color","type":"string"}],"name":"setBackgroundColor","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"string","name":"uri","type":"string"}],"name":"setBaseURI","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"components":[{"internalType":"string","name":"name","type":"string"},{"internalType":"string","name":"description","type":"string"},{"internalType":"string","name":"image","type":"string"},{"internalType":"string","name":"banner","type":"string"},{"internalType":"string","name":"website","type":"string"},{"internalType":"uint256","name":"royalties","type":"uint256"},{"internalType":"string","name":"royaltiesRecipient","type":"string"}],"internalType":"struct Indelible.ContractData","name":"data","type":"tuple"}],"name":"setContractData","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"components":[{"internalType":"uint256[]","name":"traitA","type":"uint256[]"},{"internalType":"uint256[]","name":"traitB","type":"uint256[]"}],"internalType":"struct Indelible.LinkedTraitDTO[]","name":"linkedTraits","type":"tuple[]"}],"name":"setLinkedTraits","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"max","type":"uint256"}],"name":"setMaxPerAddress","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"max","type":"uint256"}],"name":"setMaxPerAllowList","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"newMerkleRoot","type":"bytes32"}],"name":"setMerkleRoot","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"tokenId","type":"uint256"},{"internalType":"bool","name":"renderOffChain","type":"bool"}],"name":"setRenderOfTokenId","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes4","name":"interfaceId","type":"bytes4"}],"name":"supportsInterface","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"symbol","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"toggleAllowListMint","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"toggleOperatorFilter","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"togglePublicMint","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"toggleWrapSVG","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"tokenIdToHash","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"tokenIdToSVG","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"tokenURI","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalSupply","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"layerIndex","type":"uint256"},{"internalType":"uint256","name":"traitIndex","type":"uint256"}],"name":"traitData","outputs":[{"internalType":"bytes","name":"","type":"bytes"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"layerIndex","type":"uint256"},{"internalType":"uint256","name":"traitIndex","type":"uint256"}],"name":"traitDetails","outputs":[{"components":[{"internalType":"string","name":"name","type":"string"},{"internalType":"string","name":"mimetype","type":"string"},{"internalType":"bool","name":"hide","type":"bool"}],"internalType":"struct Indelible.Trait","name":"","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"from","type":"address"},{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"tokenId","type":"uint256"}],"name":"transferFrom","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"address","name":"newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"withdraw","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"}],"name":"withdrawRecipients","outputs":[{"internalType":"string","name":"name","type":"string"},{"internalType":"string","name":"imageUrl","type":"string"},{"internalType":"address","name":"recipientAddress","type":"address"},{"internalType":"uint256","name":"percentage","type":"uint256"}],"stateMutability":"view","type":"function"},{"stateMutability":"payable","type":"receive"}]',
+  'Erc721',
+);
+
+class Erc721 extends _i1.GeneratedContract {
+  Erc721({
+    required _i1.EthereumAddress address,
+    required _i1.Web3Client client,
+    int? chainId,
+  }) : super(
+          _i1.DeployedContract(
+            _contractAbi,
+            address,
+          ),
+          client,
+          chainId,
+        );
+
+  /// The optional [transaction] parameter can be used to override parameters
+  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
+  /// set by the contract.
+  Future<String> addLayer(
+    BigInt layerIndex,
+    List<dynamic> traits, {
+    required _i1.Credentials credentials,
+    _i1.Transaction? transaction,
+  }) async {
+    final function = self.abi.functions[1];
+    assert(checkSignature(function, '97d194d7'));
+    final params = [
+      layerIndex,
+      traits,
+    ];
+    return write(
+      credentials,
+      transaction,
+      function,
+      params,
+    );
+  }
+
+  /// The optional [transaction] parameter can be used to override parameters
+  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
+  /// set by the contract.
+  Future<String> addTrait(
+    BigInt layerIndex,
+    BigInt traitIndex,
+    dynamic trait, {
+    required _i1.Credentials credentials,
+    _i1.Transaction? transaction,
+  }) async {
+    final function = self.abi.functions[2];
+    assert(checkSignature(function, '180c2cc0'));
+    final params = [
+      layerIndex,
+      traitIndex,
+      trait,
+    ];
+    return write(
+      credentials,
+      transaction,
+      function,
+      params,
+    );
+  }
+
+  /// The optional [transaction] parameter can be used to override parameters
+  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
+  /// set by the contract.
+  Future<String> airdrop(
+    BigInt count,
+    _i1.EthereumAddress recipient, {
+    required _i1.Credentials credentials,
+    _i1.Transaction? transaction,
+  }) async {
+    final function = self.abi.functions[3];
+    assert(checkSignature(function, 'bc63f02e'));
+    final params = [
+      count,
+      recipient,
+    ];
+    return write(
+      credentials,
+      transaction,
+      function,
+      params,
+    );
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<BigInt> allowListPrice({_i1.BlockNum? atBlock}) async {
+    final function = self.abi.functions[4];
+    assert(checkSignature(function, 'a24e5153'));
+    final params = [];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return (response[0] as BigInt);
+  }
+
+  /// The optional [transaction] parameter can be used to override parameters
+  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
+  /// set by the contract.
+  Future<String> approve(
+    _i1.EthereumAddress to,
+    BigInt tokenId, {
+    required _i1.Credentials credentials,
+    _i1.Transaction? transaction,
+  }) async {
+    final function = self.abi.functions[5];
+    assert(checkSignature(function, '095ea7b3'));
+    final params = [
+      to,
+      tokenId,
+    ];
+    return write(
+      credentials,
+      transaction,
+      function,
+      params,
+    );
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<BigInt> balanceOf(
+    _i1.EthereumAddress owner, {
+    _i1.BlockNum? atBlock,
+  }) async {
+    final function = self.abi.functions[6];
+    assert(checkSignature(function, '70a08231'));
+    final params = [owner];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return (response[0] as BigInt);
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<String> baseURI({_i1.BlockNum? atBlock}) async {
+    final function = self.abi.functions[7];
+    assert(checkSignature(function, '6c0360eb'));
+    final params = [];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return (response[0] as String);
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<ContractData> contractData({_i1.BlockNum? atBlock}) async {
+    final function = self.abi.functions[8];
+    assert(checkSignature(function, '3cca2420'));
+    final params = [];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return ContractData(response);
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<String> contractURI({_i1.BlockNum? atBlock}) async {
+    final function = self.abi.functions[9];
+    assert(checkSignature(function, 'e8a3d485'));
+    final params = [];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return (response[0] as String);
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<_i1.EthereumAddress> getApproved(
+    BigInt tokenId, {
+    _i1.BlockNum? atBlock,
+  }) async {
+    final function = self.abi.functions[10];
+    assert(checkSignature(function, '081812fc'));
+    final params = [tokenId];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return (response[0] as _i1.EthereumAddress);
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<List<BigInt>> getLinkedTraits(
+    BigInt layerIndex,
+    BigInt traitIndex, {
+    _i1.BlockNum? atBlock,
+  }) async {
+    final function = self.abi.functions[11];
+    assert(checkSignature(function, 'dc9867ce'));
+    final params = [
+      layerIndex,
+      traitIndex,
+    ];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return (response[0] as List<dynamic>).cast<BigInt>();
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<String> hashToMetadata(
+    String _hash, {
+    _i1.BlockNum? atBlock,
+  }) async {
+    final function = self.abi.functions[12];
+    assert(checkSignature(function, '66e33870'));
+    final params = [_hash];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return (response[0] as String);
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<String> hashToSVG(
+    String _hash, {
+    _i1.BlockNum? atBlock,
+  }) async {
+    final function = self.abi.functions[13];
+    assert(checkSignature(function, '89ce3074'));
+    final params = [_hash];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return (response[0] as String);
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<bool> isAllowListActive({_i1.BlockNum? atBlock}) async {
+    final function = self.abi.functions[14];
+    assert(checkSignature(function, '29fc6bae'));
+    final params = [];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return (response[0] as bool);
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<bool> isApprovedForAll(
+    _i1.EthereumAddress owner,
+    _i1.EthereumAddress operator, {
+    _i1.BlockNum? atBlock,
+  }) async {
+    final function = self.abi.functions[15];
+    assert(checkSignature(function, 'e985e9c5'));
+    final params = [
+      owner,
+      operator,
+    ];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return (response[0] as bool);
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<bool> isContractSealed({_i1.BlockNum? atBlock}) async {
+    final function = self.abi.functions[16];
+    assert(checkSignature(function, '542d5041'));
+    final params = [];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return (response[0] as bool);
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<bool> isMintActive({_i1.BlockNum? atBlock}) async {
+    final function = self.abi.functions[17];
+    assert(checkSignature(function, '5b92ac0d'));
+    final params = [];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return (response[0] as bool);
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<bool> isOperatorFilterEnabled({_i1.BlockNum? atBlock}) async {
+    final function = self.abi.functions[18];
+    assert(checkSignature(function, '56b95562'));
+    final params = [];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return (response[0] as bool);
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<bool> isPublicMintActive({_i1.BlockNum? atBlock}) async {
+    final function = self.abi.functions[19];
+    assert(checkSignature(function, '2d6b6224'));
+    final params = [];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return (response[0] as bool);
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<BigInt> maxPerAddress({_i1.BlockNum? atBlock}) async {
+    final function = self.abi.functions[20];
+    assert(checkSignature(function, '639814e0'));
+    final params = [];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return (response[0] as BigInt);
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<BigInt> maxPerAllowList({_i1.BlockNum? atBlock}) async {
+    final function = self.abi.functions[21];
+    assert(checkSignature(function, '36cd2edd'));
+    final params = [];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return (response[0] as BigInt);
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<BigInt> maxSupply({_i1.BlockNum? atBlock}) async {
+    final function = self.abi.functions[22];
+    assert(checkSignature(function, 'd5abeb01'));
+    final params = [];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return (response[0] as BigInt);
+  }
+
+  /// The optional [transaction] parameter can be used to override parameters
+  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
+  /// set by the contract.
+  Future<String> mint(
+    BigInt count,
+    List<_i2.Uint8List> merkleProof, {
+    required _i1.Credentials credentials,
+    _i1.Transaction? transaction,
+  }) async {
+    final function = self.abi.functions[23];
+    assert(checkSignature(function, 'ba41b0c6'));
+    final params = [
+      count,
+      merkleProof,
+    ];
+    return write(
+      credentials,
+      transaction,
+      function,
+      params,
+    );
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<String> name({_i1.BlockNum? atBlock}) async {
+    final function = self.abi.functions[24];
+    assert(checkSignature(function, '06fdde03'));
+    final params = [];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return (response[0] as String);
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<bool> onAllowList(
+    _i1.EthereumAddress addr,
+    List<_i2.Uint8List> merkleProof, {
+    _i1.BlockNum? atBlock,
+  }) async {
+    final function = self.abi.functions[25];
+    assert(checkSignature(function, 'b32c5680'));
+    final params = [
+      addr,
+      merkleProof,
+    ];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return (response[0] as bool);
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<_i1.EthereumAddress> owner({_i1.BlockNum? atBlock}) async {
+    final function = self.abi.functions[26];
+    assert(checkSignature(function, '8da5cb5b'));
+    final params = [];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return (response[0] as _i1.EthereumAddress);
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<_i1.EthereumAddress> ownerOf(
+    BigInt tokenId, {
+    _i1.BlockNum? atBlock,
+  }) async {
+    final function = self.abi.functions[27];
+    assert(checkSignature(function, '6352211e'));
+    final params = [tokenId];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return (response[0] as _i1.EthereumAddress);
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<BigInt> publicMintPrice({_i1.BlockNum? atBlock}) async {
+    final function = self.abi.functions[28];
+    assert(checkSignature(function, 'dc53fd92'));
+    final params = [];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return (response[0] as BigInt);
+  }
+
+  /// The optional [transaction] parameter can be used to override parameters
+  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
+  /// set by the contract.
+  Future<String> renounceOwnership({
+    required _i1.Credentials credentials,
+    _i1.Transaction? transaction,
+  }) async {
+    final function = self.abi.functions[29];
+    assert(checkSignature(function, '715018a6'));
+    final params = [];
+    return write(
+      credentials,
+      transaction,
+      function,
+      params,
+    );
+  }
+
+  /// The optional [transaction] parameter can be used to override parameters
+  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
+  /// set by the contract.
+  Future<String> safeTransferFrom(
+    _i1.EthereumAddress from,
+    _i1.EthereumAddress to,
+    BigInt tokenId, {
+    required _i1.Credentials credentials,
+    _i1.Transaction? transaction,
+  }) async {
+    final function = self.abi.functions[30];
+    assert(checkSignature(function, '42842e0e'));
+    final params = [
+      from,
+      to,
+      tokenId,
+    ];
+    return write(
+      credentials,
+      transaction,
+      function,
+      params,
+    );
+  }
+
+  /// The optional [transaction] parameter can be used to override parameters
+  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
+  /// set by the contract.
+  Future<String> safeTransferFrom$2(
+    _i1.EthereumAddress from,
+    _i1.EthereumAddress to,
+    BigInt tokenId,
+    _i2.Uint8List data, {
+    required _i1.Credentials credentials,
+    _i1.Transaction? transaction,
+  }) async {
+    final function = self.abi.functions[31];
+    assert(checkSignature(function, 'b88d4fde'));
+    final params = [
+      from,
+      to,
+      tokenId,
+      data,
+    ];
+    return write(
+      credentials,
+      transaction,
+      function,
+      params,
+    );
+  }
+
+  /// The optional [transaction] parameter can be used to override parameters
+  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
+  /// set by the contract.
+  Future<String> sealContract({
+    required _i1.Credentials credentials,
+    _i1.Transaction? transaction,
+  }) async {
+    final function = self.abi.functions[32];
+    assert(checkSignature(function, '68bd580e'));
+    final params = [];
+    return write(
+      credentials,
+      transaction,
+      function,
+      params,
+    );
+  }
+
+  /// The optional [transaction] parameter can be used to override parameters
+  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
+  /// set by the contract.
+  Future<String> setAllowListPrice(
+    BigInt price, {
+    required _i1.Credentials credentials,
+    _i1.Transaction? transaction,
+  }) async {
+    final function = self.abi.functions[33];
+    assert(checkSignature(function, '6df9fa88'));
+    final params = [price];
+    return write(
+      credentials,
+      transaction,
+      function,
+      params,
+    );
+  }
+
+  /// The optional [transaction] parameter can be used to override parameters
+  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
+  /// set by the contract.
+  Future<String> setApprovalForAll(
+    _i1.EthereumAddress operator,
+    bool approved, {
+    required _i1.Credentials credentials,
+    _i1.Transaction? transaction,
+  }) async {
+    final function = self.abi.functions[34];
+    assert(checkSignature(function, 'a22cb465'));
+    final params = [
+      operator,
+      approved,
+    ];
+    return write(
+      credentials,
+      transaction,
+      function,
+      params,
+    );
+  }
+
+  /// The optional [transaction] parameter can be used to override parameters
+  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
+  /// set by the contract.
+  Future<String> setBackgroundColor(
+    String color, {
+    required _i1.Credentials credentials,
+    _i1.Transaction? transaction,
+  }) async {
+    final function = self.abi.functions[35];
+    assert(checkSignature(function, '6190e1da'));
+    final params = [color];
+    return write(
+      credentials,
+      transaction,
+      function,
+      params,
+    );
+  }
+
+  /// The optional [transaction] parameter can be used to override parameters
+  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
+  /// set by the contract.
+  Future<String> setBaseURI(
+    String uri, {
+    required _i1.Credentials credentials,
+    _i1.Transaction? transaction,
+  }) async {
+    final function = self.abi.functions[36];
+    assert(checkSignature(function, '55f804b3'));
+    final params = [uri];
+    return write(
+      credentials,
+      transaction,
+      function,
+      params,
+    );
+  }
+
+  /// The optional [transaction] parameter can be used to override parameters
+  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
+  /// set by the contract.
+  Future<String> setContractData(
+    dynamic data, {
+    required _i1.Credentials credentials,
+    _i1.Transaction? transaction,
+  }) async {
+    final function = self.abi.functions[37];
+    assert(checkSignature(function, '0f3debbe'));
+    final params = [data];
+    return write(
+      credentials,
+      transaction,
+      function,
+      params,
+    );
+  }
+
+  /// The optional [transaction] parameter can be used to override parameters
+  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
+  /// set by the contract.
+  Future<String> setLinkedTraits(
+    List<dynamic> linkedTraits, {
+    required _i1.Credentials credentials,
+    _i1.Transaction? transaction,
+  }) async {
+    final function = self.abi.functions[38];
+    assert(checkSignature(function, 'b4568066'));
+    final params = [linkedTraits];
+    return write(
+      credentials,
+      transaction,
+      function,
+      params,
+    );
+  }
+
+  /// The optional [transaction] parameter can be used to override parameters
+  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
+  /// set by the contract.
+  Future<String> setMaxPerAddress(
+    BigInt max, {
+    required _i1.Credentials credentials,
+    _i1.Transaction? transaction,
+  }) async {
+    final function = self.abi.functions[39];
+    assert(checkSignature(function, '7bddd65b'));
+    final params = [max];
+    return write(
+      credentials,
+      transaction,
+      function,
+      params,
+    );
+  }
+
+  /// The optional [transaction] parameter can be used to override parameters
+  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
+  /// set by the contract.
+  Future<String> setMaxPerAllowList(
+    BigInt max, {
+    required _i1.Credentials credentials,
+    _i1.Transaction? transaction,
+  }) async {
+    final function = self.abi.functions[40];
+    assert(checkSignature(function, '4ca1a0f2'));
+    final params = [max];
+    return write(
+      credentials,
+      transaction,
+      function,
+      params,
+    );
+  }
+
+  /// The optional [transaction] parameter can be used to override parameters
+  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
+  /// set by the contract.
+  Future<String> setMerkleRoot(
+    _i2.Uint8List newMerkleRoot, {
+    required _i1.Credentials credentials,
+    _i1.Transaction? transaction,
+  }) async {
+    final function = self.abi.functions[41];
+    assert(checkSignature(function, '7cb64759'));
+    final params = [newMerkleRoot];
+    return write(
+      credentials,
+      transaction,
+      function,
+      params,
+    );
+  }
+
+  /// The optional [transaction] parameter can be used to override parameters
+  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
+  /// set by the contract.
+  Future<String> setRenderOfTokenId(
+    BigInt tokenId,
+    bool renderOffChain, {
+    required _i1.Credentials credentials,
+    _i1.Transaction? transaction,
+  }) async {
+    final function = self.abi.functions[42];
+    assert(checkSignature(function, 'dbe9875f'));
+    final params = [
+      tokenId,
+      renderOffChain,
+    ];
+    return write(
+      credentials,
+      transaction,
+      function,
+      params,
+    );
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<bool> supportsInterface(
+    _i2.Uint8List interfaceId, {
+    _i1.BlockNum? atBlock,
+  }) async {
+    final function = self.abi.functions[43];
+    assert(checkSignature(function, '01ffc9a7'));
+    final params = [interfaceId];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return (response[0] as bool);
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<String> symbol({_i1.BlockNum? atBlock}) async {
+    final function = self.abi.functions[44];
+    assert(checkSignature(function, '95d89b41'));
+    final params = [];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return (response[0] as String);
+  }
+
+  /// The optional [transaction] parameter can be used to override parameters
+  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
+  /// set by the contract.
+  Future<String> toggleAllowListMint({
+    required _i1.Credentials credentials,
+    _i1.Transaction? transaction,
+  }) async {
+    final function = self.abi.functions[45];
+    assert(checkSignature(function, '8fb4e8a9'));
+    final params = [];
+    return write(
+      credentials,
+      transaction,
+      function,
+      params,
+    );
+  }
+
+  /// The optional [transaction] parameter can be used to override parameters
+  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
+  /// set by the contract.
+  Future<String> toggleOperatorFilter({
+    required _i1.Credentials credentials,
+    _i1.Transaction? transaction,
+  }) async {
+    final function = self.abi.functions[46];
+    assert(checkSignature(function, 'da9e40ea'));
+    final params = [];
+    return write(
+      credentials,
+      transaction,
+      function,
+      params,
+    );
+  }
+
+  /// The optional [transaction] parameter can be used to override parameters
+  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
+  /// set by the contract.
+  Future<String> togglePublicMint({
+    required _i1.Credentials credentials,
+    _i1.Transaction? transaction,
+  }) async {
+    final function = self.abi.functions[47];
+    assert(checkSignature(function, '4047638d'));
+    final params = [];
+    return write(
+      credentials,
+      transaction,
+      function,
+      params,
+    );
+  }
+
+  /// The optional [transaction] parameter can be used to override parameters
+  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
+  /// set by the contract.
+  Future<String> toggleWrapSVG({
+    required _i1.Credentials credentials,
+    _i1.Transaction? transaction,
+  }) async {
+    final function = self.abi.functions[48];
+    assert(checkSignature(function, '4920154b'));
+    final params = [];
+    return write(
+      credentials,
+      transaction,
+      function,
+      params,
+    );
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<String> tokenIdToHash(
+    BigInt tokenId, {
+    _i1.BlockNum? atBlock,
+  }) async {
+    final function = self.abi.functions[49];
+    assert(checkSignature(function, '621a1f74'));
+    final params = [tokenId];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return (response[0] as String);
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<String> tokenIdToSVG(
+    BigInt tokenId, {
+    _i1.BlockNum? atBlock,
+  }) async {
+    final function = self.abi.functions[50];
+    assert(checkSignature(function, 'c11feac1'));
+    final params = [tokenId];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return (response[0] as String);
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<String> tokenURI(
+    BigInt tokenId, {
+    _i1.BlockNum? atBlock,
+  }) async {
+    final function = self.abi.functions[51];
+    assert(checkSignature(function, 'c87b56dd'));
+    final params = [tokenId];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return (response[0] as String);
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<BigInt> totalSupply({_i1.BlockNum? atBlock}) async {
+    final function = self.abi.functions[52];
+    assert(checkSignature(function, '18160ddd'));
+    final params = [];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return (response[0] as BigInt);
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<_i2.Uint8List> traitData(
+    BigInt layerIndex,
+    BigInt traitIndex, {
+    _i1.BlockNum? atBlock,
+  }) async {
+    final function = self.abi.functions[53];
+    assert(checkSignature(function, '09dbabca'));
+    final params = [
+      layerIndex,
+      traitIndex,
+    ];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return (response[0] as _i2.Uint8List);
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<dynamic> traitDetails(
+    BigInt layerIndex,
+    BigInt traitIndex, {
+    _i1.BlockNum? atBlock,
+  }) async {
+    final function = self.abi.functions[54];
+    assert(checkSignature(function, 'ea84b59b'));
+    final params = [
+      layerIndex,
+      traitIndex,
+    ];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return (response[0] as dynamic);
+  }
+
+  /// The optional [transaction] parameter can be used to override parameters
+  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
+  /// set by the contract.
+  Future<String> transferFrom(
+    _i1.EthereumAddress from,
+    _i1.EthereumAddress to,
+    BigInt tokenId, {
+    required _i1.Credentials credentials,
+    _i1.Transaction? transaction,
+  }) async {
+    final function = self.abi.functions[55];
+    assert(checkSignature(function, '23b872dd'));
+    final params = [
+      from,
+      to,
+      tokenId,
+    ];
+    return write(
+      credentials,
+      transaction,
+      function,
+      params,
+    );
+  }
+
+  /// The optional [transaction] parameter can be used to override parameters
+  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
+  /// set by the contract.
+  Future<String> transferOwnership(
+    _i1.EthereumAddress newOwner, {
+    required _i1.Credentials credentials,
+    _i1.Transaction? transaction,
+  }) async {
+    final function = self.abi.functions[56];
+    assert(checkSignature(function, 'f2fde38b'));
+    final params = [newOwner];
+    return write(
+      credentials,
+      transaction,
+      function,
+      params,
+    );
+  }
+
+  /// The optional [transaction] parameter can be used to override parameters
+  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
+  /// set by the contract.
+  Future<String> withdraw({
+    required _i1.Credentials credentials,
+    _i1.Transaction? transaction,
+  }) async {
+    final function = self.abi.functions[57];
+    assert(checkSignature(function, '3ccfd60b'));
+    final params = [];
+    return write(
+      credentials,
+      transaction,
+      function,
+      params,
+    );
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<WithdrawRecipients> withdrawRecipients(
+    BigInt $param53, {
+    _i1.BlockNum? atBlock,
+  }) async {
+    final function = self.abi.functions[58];
+    assert(checkSignature(function, '876171dc'));
+    final params = [$param53];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return WithdrawRecipients(response);
+  }
+
+  /// Returns a live stream of all Approval events emitted by this contract.
+  Stream<ERC721Approval> approvalEvents({
+    _i1.BlockNum? fromBlock,
+    _i1.BlockNum? toBlock,
+  }) {
+    final event = self.event('Approval');
+    final filter = _i1.FilterOptions.events(
+      contract: self,
+      event: event,
+      fromBlock: fromBlock,
+      toBlock: toBlock,
+    );
+    return client.events(filter).map((_i1.FilterEvent result) {
+      final decoded = event.decodeResults(
+        result.topics!,
+        result.data!,
+      );
+      return ERC721Approval(
+        decoded,
+        result,
+      );
+    });
+  }
+
+  /// Returns a live stream of all ApprovalForAll events emitted by this contract.
+  Stream<ERC721ApprovalForAll> approvalForAllEvents({
+    _i1.BlockNum? fromBlock,
+    _i1.BlockNum? toBlock,
+  }) {
+    final event = self.event('ApprovalForAll');
+    final filter = _i1.FilterOptions.events(
+      contract: self,
+      event: event,
+      fromBlock: fromBlock,
+      toBlock: toBlock,
+    );
+    return client.events(filter).map((_i1.FilterEvent result) {
+      final decoded = event.decodeResults(
+        result.topics!,
+        result.data!,
+      );
+      return ERC721ApprovalForAll(
+        decoded,
+        result,
+      );
+    });
+  }
+
+  /// Returns a live stream of all ConsecutiveTransfer events emitted by this contract.
+  Stream<ConsecutiveTransfer> consecutiveTransferEvents({
+    _i1.BlockNum? fromBlock,
+    _i1.BlockNum? toBlock,
+  }) {
+    final event = self.event('ConsecutiveTransfer');
+    final filter = _i1.FilterOptions.events(
+      contract: self,
+      event: event,
+      fromBlock: fromBlock,
+      toBlock: toBlock,
+    );
+    return client.events(filter).map((_i1.FilterEvent result) {
+      final decoded = event.decodeResults(
+        result.topics!,
+        result.data!,
+      );
+      return ConsecutiveTransfer(
+        decoded,
+        result,
+      );
+    });
+  }
+
+  /// Returns a live stream of all OwnershipTransferred events emitted by this contract.
+  Stream<ERC721OwnershipTransferred> ownershipTransferredEvents({
+    _i1.BlockNum? fromBlock,
+    _i1.BlockNum? toBlock,
+  }) {
+    final event = self.event('OwnershipTransferred');
+    final filter = _i1.FilterOptions.events(
+      contract: self,
+      event: event,
+      fromBlock: fromBlock,
+      toBlock: toBlock,
+    );
+    return client.events(filter).map((_i1.FilterEvent result) {
+      final decoded = event.decodeResults(
+        result.topics!,
+        result.data!,
+      );
+      return ERC721OwnershipTransferred(
+        decoded,
+        result,
+      );
+    });
+  }
+
+  /// Returns a live stream of all Transfer events emitted by this contract.
+  Stream<ERC721Transfer> transferEvents({
+    _i1.BlockNum? fromBlock,
+    _i1.BlockNum? toBlock,
+  }) {
+    final event = self.event('Transfer');
+    final filter = _i1.FilterOptions.events(
+      contract: self,
+      event: event,
+      fromBlock: fromBlock,
+      toBlock: toBlock,
+    );
+    return client.events(filter).map((_i1.FilterEvent result) {
+      final decoded = event.decodeResults(
+        result.topics!,
+        result.data!,
+      );
+      return ERC721Transfer(
+        decoded,
+        result,
+      );
+    });
+  }
+}
+
+class ContractData {
+  ContractData(List<dynamic> response)
+      : name = (response[0] as String),
+        description = (response[1] as String),
+        image = (response[2] as String),
+        banner = (response[3] as String),
+        website = (response[4] as String),
+        royalties = (response[5] as BigInt),
+        royaltiesRecipient = (response[6] as String);
+
+  final String name;
+
+  final String description;
+
+  final String image;
+
+  final String banner;
+
+  final String website;
+
+  final BigInt royalties;
+
+  final String royaltiesRecipient;
+}
+
+class WithdrawRecipients {
+  WithdrawRecipients(List<dynamic> response)
+      : name = (response[0] as String),
+        imageUrl = (response[1] as String),
+        recipientAddress = (response[2] as _i1.EthereumAddress),
+        percentage = (response[3] as BigInt);
+
+  final String name;
+
+  final String imageUrl;
+
+  final _i1.EthereumAddress recipientAddress;
+
+  final BigInt percentage;
+}
+
+class ERC721Approval {
+  ERC721Approval(
+    List<dynamic> response,
+    this.event,
+  )   : owner = (response[0] as _i1.EthereumAddress),
+        approved = (response[1] as _i1.EthereumAddress),
+        tokenId = (response[2] as BigInt);
+
+  final _i1.EthereumAddress owner;
+
+  final _i1.EthereumAddress approved;
+
+  final BigInt tokenId;
+
+  final _i1.FilterEvent event;
+}
+
+class ERC721ApprovalForAll {
+  ERC721ApprovalForAll(
+    List<dynamic> response,
+    this.event,
+  )   : owner = (response[0] as _i1.EthereumAddress),
+        operator = (response[1] as _i1.EthereumAddress),
+        approved = (response[2] as bool);
+
+  final _i1.EthereumAddress owner;
+
+  final _i1.EthereumAddress operator;
+
+  final bool approved;
+
+  final _i1.FilterEvent event;
+}
+
+class ConsecutiveTransfer {
+  ConsecutiveTransfer(
+    List<dynamic> response,
+    this.event,
+  )   : fromTokenId = (response[0] as BigInt),
+        toTokenId = (response[1] as BigInt),
+        from = (response[2] as _i1.EthereumAddress),
+        to = (response[3] as _i1.EthereumAddress);
+
+  final BigInt fromTokenId;
+
+  final BigInt toTokenId;
+
+  final _i1.EthereumAddress from;
+
+  final _i1.EthereumAddress to;
+
+  final _i1.FilterEvent event;
+}
+
+class ERC721OwnershipTransferred {
+  ERC721OwnershipTransferred(
+    List<dynamic> response,
+    this.event,
+  )   : previousOwner = (response[0] as _i1.EthereumAddress),
+        newOwner = (response[1] as _i1.EthereumAddress);
+
+  final _i1.EthereumAddress previousOwner;
+
+  final _i1.EthereumAddress newOwner;
+
+  final _i1.FilterEvent event;
+}
+
+class ERC721Transfer {
+  ERC721Transfer(
+    List<dynamic> response,
+    this.event,
+  )   : from = (response[0] as _i1.EthereumAddress),
+        to = (response[1] as _i1.EthereumAddress),
+        tokenId = (response[2] as BigInt);
+
+  final _i1.EthereumAddress from;
+
+  final _i1.EthereumAddress to;
+
+  final BigInt tokenId;
+
+  final _i1.FilterEvent event;
+}
diff --git a/packages/ens_dart/lib/src/contracts/storage.g.dart b/packages/ens_dart/lib/src/contracts/storage.g.dart
new file mode 100644
index 00000000..468b4763
--- /dev/null
+++ b/packages/ens_dart/lib/src/contracts/storage.g.dart
@@ -0,0 +1,170 @@
+// Generated code, do not modify. Run `build_runner build` to re-generate!
+// @dart=2.12
+// ignore_for_file: no_leading_underscores_for_library_prefixes
+import 'package:web3dart/web3dart.dart' as _i1;
+
+final _contractAbi = _i1.ContractAbi.fromJson(
+  '[{"anonymous":false,"inputs":[{"indexed":true,"internalType":"string","name":"id","type":"string"},{"indexed":true,"internalType":"string","name":"store","type":"string"},{"indexed":false,"internalType":"string","name":"key","type":"string"},{"indexed":false,"internalType":"string","name":"value","type":"string"}],"name":"StorageUpdated","type":"event"},{"inputs":[{"internalType":"string","name":"store","type":"string"},{"internalType":"string","name":"key","type":"string"}],"name":"getItem","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"store","type":"string"},{"internalType":"string[]","name":"keys","type":"string[]"}],"name":"getStorage","outputs":[{"internalType":"string[]","name":"","type":"string[]"},{"internalType":"string[]","name":"","type":"string[]"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"string","name":"store","type":"string"},{"internalType":"string","name":"key","type":"string"},{"internalType":"string","name":"value","type":"string"}],"name":"setItem","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"string","name":"store","type":"string"},{"internalType":"string[][]","name":"pairs","type":"string[][]"}],"name":"setStorage","outputs":[],"stateMutability":"nonpayable","type":"function"}]',
+  'Storage',
+);
+
+class Storage extends _i1.GeneratedContract {
+  Storage({
+    required _i1.EthereumAddress address,
+    required _i1.Web3Client client,
+    int? chainId,
+  }) : super(
+          _i1.DeployedContract(
+            _contractAbi,
+            address,
+          ),
+          client,
+          chainId,
+        );
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<String> getItem(
+    String store,
+    String key, {
+    _i1.BlockNum? atBlock,
+  }) async {
+    final function = self.abi.functions[0];
+    assert(checkSignature(function, 'c9b2b671'));
+    final params = [
+      store,
+      key,
+    ];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return (response[0] as String);
+  }
+
+  /// The optional [atBlock] parameter can be used to view historical data. When
+  /// set, the function will be evaluated in the specified block. By default, the
+  /// latest on-chain block will be used.
+  Future<GetStorage> getStorage(
+    String store,
+    List<String> keys, {
+    _i1.BlockNum? atBlock,
+  }) async {
+    final function = self.abi.functions[1];
+    assert(checkSignature(function, '503c1937'));
+    final params = [
+      store,
+      keys,
+    ];
+    final response = await read(
+      function,
+      params,
+      atBlock,
+    );
+    return GetStorage(response);
+  }
+
+  /// The optional [transaction] parameter can be used to override parameters
+  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
+  /// set by the contract.
+  Future<String> setItem(
+    String store,
+    String key,
+    String value, {
+    required _i1.Credentials credentials,
+    _i1.Transaction? transaction,
+  }) async {
+    final function = self.abi.functions[2];
+    assert(checkSignature(function, 'ca9b84ad'));
+    final params = [
+      store,
+      key,
+      value,
+    ];
+    return write(
+      credentials,
+      transaction,
+      function,
+      params,
+    );
+  }
+
+  /// The optional [transaction] parameter can be used to override parameters
+  /// like the gas price, nonce and max gas. The `data` and `to` fields will be
+  /// set by the contract.
+  Future<String> setStorage(
+    String store,
+    List<List<String>> pairs, {
+    required _i1.Credentials credentials,
+    _i1.Transaction? transaction,
+  }) async {
+    final function = self.abi.functions[3];
+    assert(checkSignature(function, '5e434f40'));
+    final params = [
+      store,
+      pairs,
+    ];
+    return write(
+      credentials,
+      transaction,
+      function,
+      params,
+    );
+  }
+
+  /// Returns a live stream of all StorageUpdated events emitted by this contract.
+  Stream<StorageUpdated> storageUpdatedEvents({
+    _i1.BlockNum? fromBlock,
+    _i1.BlockNum? toBlock,
+  }) {
+    final event = self.event('StorageUpdated');
+    final filter = _i1.FilterOptions.events(
+      contract: self,
+      event: event,
+      fromBlock: fromBlock,
+      toBlock: toBlock,
+    );
+    return client.events(filter).map((_i1.FilterEvent result) {
+      final decoded = event.decodeResults(
+        result.topics!,
+        result.data!,
+      );
+      return StorageUpdated(
+        decoded,
+        result,
+      );
+    });
+  }
+}
+
+class GetStorage {
+  GetStorage(List<dynamic> response)
+      : var1 = (response[0] as List<dynamic>).cast<String>(),
+        var2 = (response[1] as List<dynamic>).cast<String>();
+
+  final List<String> var1;
+
+  final List<String> var2;
+}
+
+class StorageUpdated {
+  StorageUpdated(
+    List<dynamic> response,
+    this.event,
+  )   : id = (response[0] as String),
+        store = (response[1] as String),
+        key = (response[2] as String),
+        value = (response[3] as String);
+
+  final String id;
+
+  final String store;
+
+  final String key;
+
+  final String value;
+
+  final _i1.FilterEvent event;
+}
diff --git a/packages/ens_dart/lib/src/json/erc721.abi.json b/packages/ens_dart/lib/src/json/erc721.abi.json
new file mode 100644
index 00000000..3dc21732
--- /dev/null
+++ b/packages/ens_dart/lib/src/json/erc721.abi.json
@@ -0,0 +1,1327 @@
+[
+    {
+        "inputs": [],
+        "stateMutability": "nonpayable",
+        "type": "constructor"
+    },
+    {
+        "inputs": [],
+        "name": "ApprovalCallerNotOwnerNorApproved",
+        "type": "error"
+    },
+    {
+        "inputs": [],
+        "name": "ApprovalQueryForNonexistentToken",
+        "type": "error"
+    },
+    {
+        "inputs": [],
+        "name": "BalanceQueryForZeroAddress",
+        "type": "error"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "uint256",
+                "name": "_size",
+                "type": "uint256"
+            },
+            {
+                "internalType": "uint256",
+                "name": "_start",
+                "type": "uint256"
+            },
+            {
+                "internalType": "uint256",
+                "name": "_end",
+                "type": "uint256"
+            }
+        ],
+        "name": "InvalidCodeAtRange",
+        "type": "error"
+    },
+    {
+        "inputs": [],
+        "name": "MintERC2309QuantityExceedsLimit",
+        "type": "error"
+    },
+    {
+        "inputs": [],
+        "name": "MintToZeroAddress",
+        "type": "error"
+    },
+    {
+        "inputs": [],
+        "name": "MintZeroQuantity",
+        "type": "error"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "operator",
+                "type": "address"
+            }
+        ],
+        "name": "OperatorNotAllowed",
+        "type": "error"
+    },
+    {
+        "inputs": [],
+        "name": "OwnerQueryForNonexistentToken",
+        "type": "error"
+    },
+    {
+        "inputs": [],
+        "name": "OwnershipNotInitializedForExtraData",
+        "type": "error"
+    },
+    {
+        "inputs": [],
+        "name": "TransferCallerNotOwnerNorApproved",
+        "type": "error"
+    },
+    {
+        "inputs": [],
+        "name": "TransferFromIncorrectOwner",
+        "type": "error"
+    },
+    {
+        "inputs": [],
+        "name": "TransferToNonERC721ReceiverImplementer",
+        "type": "error"
+    },
+    {
+        "inputs": [],
+        "name": "TransferToZeroAddress",
+        "type": "error"
+    },
+    {
+        "inputs": [],
+        "name": "URIQueryForNonexistentToken",
+        "type": "error"
+    },
+    {
+        "inputs": [],
+        "name": "WriteError",
+        "type": "error"
+    },
+    {
+        "anonymous": false,
+        "inputs": [
+            {
+                "indexed": true,
+                "internalType": "address",
+                "name": "owner",
+                "type": "address"
+            },
+            {
+                "indexed": true,
+                "internalType": "address",
+                "name": "approved",
+                "type": "address"
+            },
+            {
+                "indexed": true,
+                "internalType": "uint256",
+                "name": "tokenId",
+                "type": "uint256"
+            }
+        ],
+        "name": "Approval",
+        "type": "event"
+    },
+    {
+        "anonymous": false,
+        "inputs": [
+            {
+                "indexed": true,
+                "internalType": "address",
+                "name": "owner",
+                "type": "address"
+            },
+            {
+                "indexed": true,
+                "internalType": "address",
+                "name": "operator",
+                "type": "address"
+            },
+            {
+                "indexed": false,
+                "internalType": "bool",
+                "name": "approved",
+                "type": "bool"
+            }
+        ],
+        "name": "ApprovalForAll",
+        "type": "event"
+    },
+    {
+        "anonymous": false,
+        "inputs": [
+            {
+                "indexed": true,
+                "internalType": "uint256",
+                "name": "fromTokenId",
+                "type": "uint256"
+            },
+            {
+                "indexed": false,
+                "internalType": "uint256",
+                "name": "toTokenId",
+                "type": "uint256"
+            },
+            {
+                "indexed": true,
+                "internalType": "address",
+                "name": "from",
+                "type": "address"
+            },
+            {
+                "indexed": true,
+                "internalType": "address",
+                "name": "to",
+                "type": "address"
+            }
+        ],
+        "name": "ConsecutiveTransfer",
+        "type": "event"
+    },
+    {
+        "anonymous": false,
+        "inputs": [
+            {
+                "indexed": true,
+                "internalType": "address",
+                "name": "previousOwner",
+                "type": "address"
+            },
+            {
+                "indexed": true,
+                "internalType": "address",
+                "name": "newOwner",
+                "type": "address"
+            }
+        ],
+        "name": "OwnershipTransferred",
+        "type": "event"
+    },
+    {
+        "anonymous": false,
+        "inputs": [
+            {
+                "indexed": true,
+                "internalType": "address",
+                "name": "from",
+                "type": "address"
+            },
+            {
+                "indexed": true,
+                "internalType": "address",
+                "name": "to",
+                "type": "address"
+            },
+            {
+                "indexed": true,
+                "internalType": "uint256",
+                "name": "tokenId",
+                "type": "uint256"
+            }
+        ],
+        "name": "Transfer",
+        "type": "event"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "uint256",
+                "name": "layerIndex",
+                "type": "uint256"
+            },
+            {
+                "components": [
+                    {
+                        "internalType": "string",
+                        "name": "name",
+                        "type": "string"
+                    },
+                    {
+                        "internalType": "string",
+                        "name": "mimetype",
+                        "type": "string"
+                    },
+                    {
+                        "internalType": "bytes",
+                        "name": "data",
+                        "type": "bytes"
+                    },
+                    {
+                        "internalType": "bool",
+                        "name": "hide",
+                        "type": "bool"
+                    },
+                    {
+                        "internalType": "bool",
+                        "name": "useExistingData",
+                        "type": "bool"
+                    },
+                    {
+                        "internalType": "uint256",
+                        "name": "existingDataIndex",
+                        "type": "uint256"
+                    }
+                ],
+                "internalType": "struct Indelible.TraitDTO[]",
+                "name": "traits",
+                "type": "tuple[]"
+            }
+        ],
+        "name": "addLayer",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "uint256",
+                "name": "layerIndex",
+                "type": "uint256"
+            },
+            {
+                "internalType": "uint256",
+                "name": "traitIndex",
+                "type": "uint256"
+            },
+            {
+                "components": [
+                    {
+                        "internalType": "string",
+                        "name": "name",
+                        "type": "string"
+                    },
+                    {
+                        "internalType": "string",
+                        "name": "mimetype",
+                        "type": "string"
+                    },
+                    {
+                        "internalType": "bytes",
+                        "name": "data",
+                        "type": "bytes"
+                    },
+                    {
+                        "internalType": "bool",
+                        "name": "hide",
+                        "type": "bool"
+                    },
+                    {
+                        "internalType": "bool",
+                        "name": "useExistingData",
+                        "type": "bool"
+                    },
+                    {
+                        "internalType": "uint256",
+                        "name": "existingDataIndex",
+                        "type": "uint256"
+                    }
+                ],
+                "internalType": "struct Indelible.TraitDTO",
+                "name": "trait",
+                "type": "tuple"
+            }
+        ],
+        "name": "addTrait",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "uint256",
+                "name": "count",
+                "type": "uint256"
+            },
+            {
+                "internalType": "address",
+                "name": "recipient",
+                "type": "address"
+            }
+        ],
+        "name": "airdrop",
+        "outputs": [
+            {
+                "internalType": "uint256",
+                "name": "",
+                "type": "uint256"
+            }
+        ],
+        "stateMutability": "payable",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "allowListPrice",
+        "outputs": [
+            {
+                "internalType": "uint256",
+                "name": "",
+                "type": "uint256"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "to",
+                "type": "address"
+            },
+            {
+                "internalType": "uint256",
+                "name": "tokenId",
+                "type": "uint256"
+            }
+        ],
+        "name": "approve",
+        "outputs": [],
+        "stateMutability": "payable",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "owner",
+                "type": "address"
+            }
+        ],
+        "name": "balanceOf",
+        "outputs": [
+            {
+                "internalType": "uint256",
+                "name": "",
+                "type": "uint256"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "baseURI",
+        "outputs": [
+            {
+                "internalType": "string",
+                "name": "",
+                "type": "string"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "contractData",
+        "outputs": [
+            {
+                "internalType": "string",
+                "name": "name",
+                "type": "string"
+            },
+            {
+                "internalType": "string",
+                "name": "description",
+                "type": "string"
+            },
+            {
+                "internalType": "string",
+                "name": "image",
+                "type": "string"
+            },
+            {
+                "internalType": "string",
+                "name": "banner",
+                "type": "string"
+            },
+            {
+                "internalType": "string",
+                "name": "website",
+                "type": "string"
+            },
+            {
+                "internalType": "uint256",
+                "name": "royalties",
+                "type": "uint256"
+            },
+            {
+                "internalType": "string",
+                "name": "royaltiesRecipient",
+                "type": "string"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "contractURI",
+        "outputs": [
+            {
+                "internalType": "string",
+                "name": "",
+                "type": "string"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "uint256",
+                "name": "tokenId",
+                "type": "uint256"
+            }
+        ],
+        "name": "getApproved",
+        "outputs": [
+            {
+                "internalType": "address",
+                "name": "",
+                "type": "address"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "uint256",
+                "name": "layerIndex",
+                "type": "uint256"
+            },
+            {
+                "internalType": "uint256",
+                "name": "traitIndex",
+                "type": "uint256"
+            }
+        ],
+        "name": "getLinkedTraits",
+        "outputs": [
+            {
+                "internalType": "uint256[]",
+                "name": "",
+                "type": "uint256[]"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "string",
+                "name": "_hash",
+                "type": "string"
+            }
+        ],
+        "name": "hashToMetadata",
+        "outputs": [
+            {
+                "internalType": "string",
+                "name": "",
+                "type": "string"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "string",
+                "name": "_hash",
+                "type": "string"
+            }
+        ],
+        "name": "hashToSVG",
+        "outputs": [
+            {
+                "internalType": "string",
+                "name": "",
+                "type": "string"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "isAllowListActive",
+        "outputs": [
+            {
+                "internalType": "bool",
+                "name": "",
+                "type": "bool"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "owner",
+                "type": "address"
+            },
+            {
+                "internalType": "address",
+                "name": "operator",
+                "type": "address"
+            }
+        ],
+        "name": "isApprovedForAll",
+        "outputs": [
+            {
+                "internalType": "bool",
+                "name": "",
+                "type": "bool"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "isContractSealed",
+        "outputs": [
+            {
+                "internalType": "bool",
+                "name": "",
+                "type": "bool"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "isMintActive",
+        "outputs": [
+            {
+                "internalType": "bool",
+                "name": "",
+                "type": "bool"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "isOperatorFilterEnabled",
+        "outputs": [
+            {
+                "internalType": "bool",
+                "name": "",
+                "type": "bool"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "isPublicMintActive",
+        "outputs": [
+            {
+                "internalType": "bool",
+                "name": "",
+                "type": "bool"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "maxPerAddress",
+        "outputs": [
+            {
+                "internalType": "uint256",
+                "name": "",
+                "type": "uint256"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "maxPerAllowList",
+        "outputs": [
+            {
+                "internalType": "uint256",
+                "name": "",
+                "type": "uint256"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "maxSupply",
+        "outputs": [
+            {
+                "internalType": "uint256",
+                "name": "",
+                "type": "uint256"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "uint256",
+                "name": "count",
+                "type": "uint256"
+            },
+            {
+                "internalType": "bytes32[]",
+                "name": "merkleProof",
+                "type": "bytes32[]"
+            }
+        ],
+        "name": "mint",
+        "outputs": [
+            {
+                "internalType": "uint256",
+                "name": "",
+                "type": "uint256"
+            }
+        ],
+        "stateMutability": "payable",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "name",
+        "outputs": [
+            {
+                "internalType": "string",
+                "name": "",
+                "type": "string"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "addr",
+                "type": "address"
+            },
+            {
+                "internalType": "bytes32[]",
+                "name": "merkleProof",
+                "type": "bytes32[]"
+            }
+        ],
+        "name": "onAllowList",
+        "outputs": [
+            {
+                "internalType": "bool",
+                "name": "",
+                "type": "bool"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "owner",
+        "outputs": [
+            {
+                "internalType": "address",
+                "name": "",
+                "type": "address"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "uint256",
+                "name": "tokenId",
+                "type": "uint256"
+            }
+        ],
+        "name": "ownerOf",
+        "outputs": [
+            {
+                "internalType": "address",
+                "name": "",
+                "type": "address"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "publicMintPrice",
+        "outputs": [
+            {
+                "internalType": "uint256",
+                "name": "",
+                "type": "uint256"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "renounceOwnership",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "from",
+                "type": "address"
+            },
+            {
+                "internalType": "address",
+                "name": "to",
+                "type": "address"
+            },
+            {
+                "internalType": "uint256",
+                "name": "tokenId",
+                "type": "uint256"
+            }
+        ],
+        "name": "safeTransferFrom",
+        "outputs": [],
+        "stateMutability": "payable",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "from",
+                "type": "address"
+            },
+            {
+                "internalType": "address",
+                "name": "to",
+                "type": "address"
+            },
+            {
+                "internalType": "uint256",
+                "name": "tokenId",
+                "type": "uint256"
+            },
+            {
+                "internalType": "bytes",
+                "name": "data",
+                "type": "bytes"
+            }
+        ],
+        "name": "safeTransferFrom",
+        "outputs": [],
+        "stateMutability": "payable",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "sealContract",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "uint256",
+                "name": "price",
+                "type": "uint256"
+            }
+        ],
+        "name": "setAllowListPrice",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "operator",
+                "type": "address"
+            },
+            {
+                "internalType": "bool",
+                "name": "approved",
+                "type": "bool"
+            }
+        ],
+        "name": "setApprovalForAll",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "string",
+                "name": "color",
+                "type": "string"
+            }
+        ],
+        "name": "setBackgroundColor",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "string",
+                "name": "uri",
+                "type": "string"
+            }
+        ],
+        "name": "setBaseURI",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "components": [
+                    {
+                        "internalType": "string",
+                        "name": "name",
+                        "type": "string"
+                    },
+                    {
+                        "internalType": "string",
+                        "name": "description",
+                        "type": "string"
+                    },
+                    {
+                        "internalType": "string",
+                        "name": "image",
+                        "type": "string"
+                    },
+                    {
+                        "internalType": "string",
+                        "name": "banner",
+                        "type": "string"
+                    },
+                    {
+                        "internalType": "string",
+                        "name": "website",
+                        "type": "string"
+                    },
+                    {
+                        "internalType": "uint256",
+                        "name": "royalties",
+                        "type": "uint256"
+                    },
+                    {
+                        "internalType": "string",
+                        "name": "royaltiesRecipient",
+                        "type": "string"
+                    }
+                ],
+                "internalType": "struct Indelible.ContractData",
+                "name": "data",
+                "type": "tuple"
+            }
+        ],
+        "name": "setContractData",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "components": [
+                    {
+                        "internalType": "uint256[]",
+                        "name": "traitA",
+                        "type": "uint256[]"
+                    },
+                    {
+                        "internalType": "uint256[]",
+                        "name": "traitB",
+                        "type": "uint256[]"
+                    }
+                ],
+                "internalType": "struct Indelible.LinkedTraitDTO[]",
+                "name": "linkedTraits",
+                "type": "tuple[]"
+            }
+        ],
+        "name": "setLinkedTraits",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "uint256",
+                "name": "max",
+                "type": "uint256"
+            }
+        ],
+        "name": "setMaxPerAddress",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "uint256",
+                "name": "max",
+                "type": "uint256"
+            }
+        ],
+        "name": "setMaxPerAllowList",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "bytes32",
+                "name": "newMerkleRoot",
+                "type": "bytes32"
+            }
+        ],
+        "name": "setMerkleRoot",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "uint256",
+                "name": "tokenId",
+                "type": "uint256"
+            },
+            {
+                "internalType": "bool",
+                "name": "renderOffChain",
+                "type": "bool"
+            }
+        ],
+        "name": "setRenderOfTokenId",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "bytes4",
+                "name": "interfaceId",
+                "type": "bytes4"
+            }
+        ],
+        "name": "supportsInterface",
+        "outputs": [
+            {
+                "internalType": "bool",
+                "name": "",
+                "type": "bool"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "symbol",
+        "outputs": [
+            {
+                "internalType": "string",
+                "name": "",
+                "type": "string"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "toggleAllowListMint",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "toggleOperatorFilter",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "togglePublicMint",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "toggleWrapSVG",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "uint256",
+                "name": "tokenId",
+                "type": "uint256"
+            }
+        ],
+        "name": "tokenIdToHash",
+        "outputs": [
+            {
+                "internalType": "string",
+                "name": "",
+                "type": "string"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "uint256",
+                "name": "tokenId",
+                "type": "uint256"
+            }
+        ],
+        "name": "tokenIdToSVG",
+        "outputs": [
+            {
+                "internalType": "string",
+                "name": "",
+                "type": "string"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "uint256",
+                "name": "tokenId",
+                "type": "uint256"
+            }
+        ],
+        "name": "tokenURI",
+        "outputs": [
+            {
+                "internalType": "string",
+                "name": "",
+                "type": "string"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "totalSupply",
+        "outputs": [
+            {
+                "internalType": "uint256",
+                "name": "",
+                "type": "uint256"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "uint256",
+                "name": "layerIndex",
+                "type": "uint256"
+            },
+            {
+                "internalType": "uint256",
+                "name": "traitIndex",
+                "type": "uint256"
+            }
+        ],
+        "name": "traitData",
+        "outputs": [
+            {
+                "internalType": "bytes",
+                "name": "",
+                "type": "bytes"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "uint256",
+                "name": "layerIndex",
+                "type": "uint256"
+            },
+            {
+                "internalType": "uint256",
+                "name": "traitIndex",
+                "type": "uint256"
+            }
+        ],
+        "name": "traitDetails",
+        "outputs": [
+            {
+                "components": [
+                    {
+                        "internalType": "string",
+                        "name": "name",
+                        "type": "string"
+                    },
+                    {
+                        "internalType": "string",
+                        "name": "mimetype",
+                        "type": "string"
+                    },
+                    {
+                        "internalType": "bool",
+                        "name": "hide",
+                        "type": "bool"
+                    }
+                ],
+                "internalType": "struct Indelible.Trait",
+                "name": "",
+                "type": "tuple"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "from",
+                "type": "address"
+            },
+            {
+                "internalType": "address",
+                "name": "to",
+                "type": "address"
+            },
+            {
+                "internalType": "uint256",
+                "name": "tokenId",
+                "type": "uint256"
+            }
+        ],
+        "name": "transferFrom",
+        "outputs": [],
+        "stateMutability": "payable",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "newOwner",
+                "type": "address"
+            }
+        ],
+        "name": "transferOwnership",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [],
+        "name": "withdraw",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
+    {
+        "inputs": [
+            {
+                "internalType": "uint256",
+                "name": "",
+                "type": "uint256"
+            }
+        ],
+        "name": "withdrawRecipients",
+        "outputs": [
+            {
+                "internalType": "string",
+                "name": "name",
+                "type": "string"
+            },
+            {
+                "internalType": "string",
+                "name": "imageUrl",
+                "type": "string"
+            },
+            {
+                "internalType": "address",
+                "name": "recipientAddress",
+                "type": "address"
+            },
+            {
+                "internalType": "uint256",
+                "name": "percentage",
+                "type": "uint256"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    },
+    {
+        "stateMutability": "payable",
+        "type": "receive"
+    }
+]
\ No newline at end of file
diff --git a/packages/ens_dart/lib/src/json/storage.abi.json b/packages/ens_dart/lib/src/json/storage.abi.json
new file mode 100644
index 00000000..5dbb192c
--- /dev/null
+++ b/packages/ens_dart/lib/src/json/storage.abi.json
@@ -0,0 +1,127 @@
+[
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "string",
+          "name": "id",
+          "type": "string"
+        },
+        {
+          "indexed": true,
+          "internalType": "string",
+          "name": "store",
+          "type": "string"
+        },
+        {
+          "indexed": false,
+          "internalType": "string",
+          "name": "key",
+          "type": "string"
+        },
+        {
+          "indexed": false,
+          "internalType": "string",
+          "name": "value",
+          "type": "string"
+        }
+      ],
+      "name": "StorageUpdated",
+      "type": "event"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "string",
+          "name": "store",
+          "type": "string"
+        },
+        {
+          "internalType": "string",
+          "name": "key",
+          "type": "string"
+        }
+      ],
+      "name": "getItem",
+      "outputs": [
+        {
+          "internalType": "string",
+          "name": "",
+          "type": "string"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "string",
+          "name": "store",
+          "type": "string"
+        },
+        {
+          "internalType": "string[]",
+          "name": "keys",
+          "type": "string[]"
+        }
+      ],
+      "name": "getStorage",
+      "outputs": [
+        {
+          "internalType": "string[]",
+          "name": "",
+          "type": "string[]"
+        },
+        {
+          "internalType": "string[]",
+          "name": "",
+          "type": "string[]"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "string",
+          "name": "store",
+          "type": "string"
+        },
+        {
+          "internalType": "string",
+          "name": "key",
+          "type": "string"
+        },
+        {
+          "internalType": "string",
+          "name": "value",
+          "type": "string"
+        }
+      ],
+      "name": "setItem",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "string",
+          "name": "store",
+          "type": "string"
+        },
+        {
+          "internalType": "string[][]",
+          "name": "pairs",
+          "type": "string[][]"
+        }
+      ],
+      "name": "setStorage",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    }
+  ]
\ No newline at end of file
diff --git a/packages/shared b/packages/shared
index 5cbb0d14..97b5f5b1 160000
--- a/packages/shared
+++ b/packages/shared
@@ -1 +1 @@
-Subproject commit 5cbb0d141c97876ec2afa7994952f0896c0b2284
+Subproject commit 97b5f5b127d2b787be4971a7fd096745f92420aa
diff --git a/pubspec.lock b/pubspec.lock
index 0b921bf3..85c5b1aa 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -347,10 +347,10 @@ packages:
     dependency: "direct main"
     description:
       name: favicon
-      sha256: "7bd54f7d36d84b91c746277ae2570643f9ba0f67510ef92476d6d30539124cfb"
+      sha256: "627fa31a9de0e791501a214a4418cd03681e1a259e159a75c8a6c28b83817b02"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   ffi:
     dependency: transitive
     description:
@@ -506,14 +506,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.8.0"
-  flutter_launcher_icons:
-    dependency: "direct dev"
-    description:
-      name: flutter_launcher_icons
-      sha256: "559c600f056e7c704bd843723c21e01b5fba47e8824bd02422165bcc02a5de1d"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.9.3"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -837,10 +829,10 @@ packages:
     dependency: transitive
     description:
       name: image
-      sha256: "8e9d133755c3e84c73288363e6343157c383a0c6c56fc51afcc5d4d7180306d6"
+      sha256: a72242c9a0ffb65d03de1b7113bc4e189686fc07c7147b8b41811d0dd0e0d9bf
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.0"
+    version: "4.0.17"
   intl:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 8ed3055d..0e8794a5 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
-name: datadashwallet
-description: AXS wallet using an ERC-20 smart contract.
+name: moonchain_wallet
+description: Self custodial Moonchain wallet, Seamless interaction with MXC chains & EVM based chains, Enabling users to Send/Receive tokens, NFTs, and interact with Web3 DApps.
 # The following line prevents the package from being accidentally published to
 # pub.dev using `flutter pub publish`. This is preferred for private packages.
 publish_to: "none" # Remove this line if you wish to publish to pub.dev
@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 2.5.1
+version: 3.0.0
 
 environment:
   sdk: ">=2.19.0 <3.0.0"
@@ -99,11 +99,9 @@ dependencies:
   wifi_scan: ^0.4.1
 
 dev_dependencies:
-  flutter_launcher_icons: ^0.9.0
   flutter_lints: ^2.0.0
   flutter_test:
     sdk: flutter
-
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
 # The following section is specific to Flutter packages.
@@ -117,7 +115,6 @@ flutter:
   assets:
     - assets/.env
     - assets/flutter_i18n/
-    - assets/images/security/
     - assets/svg/
     - assets/svg/networks/
     - assets/svg/splash/
@@ -127,6 +124,7 @@ flutter:
     - assets/lottie/gestures/
     - assets/pdf/
     - assets/js/bluetooth/
+    - assets/image/miners/
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/assets-and-images/#resolution-aware
@@ -137,13 +135,8 @@ flutter:
   # "family" key with the font family name, and a "fonts" key with a
   # list giving the asset and other descriptors for the font. For
   # example:
+
   fonts:
-    - family: .SF NS Display
-      fonts:
-        - asset: assets/fonts/SFNSDisplay.ttf
-    - family: .SF NS Text
-      fonts:
-        - asset: assets/fonts/SFNSText.ttf
     - family: Roboto
       fonts:
         - asset: assets/fonts/Roboto-Regular.ttf
@@ -153,5 +146,3 @@ flutter:
     - family: MxcIcons
       fonts:
         - asset: assets/icons/mxc-icons.ttf
-  # For details regarding fonts from package dependencies,
-  # see https://flutter.dev/custom-fonts/#from-packages
diff --git a/test/unit_test.dart b/test/unit_test.dart
index 5a91af2f..694c98db 100644
--- a/test/unit_test.dart
+++ b/test/unit_test.dart
@@ -1,4 +1,4 @@
-import 'package:datadashwallet/common/common.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {
diff --git a/test/widget_test.dart b/test/widget_test.dart
index aefafa09..ae85d80c 100644
--- a/test/widget_test.dart
+++ b/test/widget_test.dart
@@ -8,7 +8,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import 'package:datadashwallet/main.dart';
+import 'package:moonchain_wallet/main.dart';
 
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {
diff --git a/translations/translate.py b/translations/translate.py
new file mode 100644
index 00000000..d07dcd48
--- /dev/null
+++ b/translations/translate.py
@@ -0,0 +1,82 @@
+import google.generativeai as genai
+import json
+import time
+import argparse
+import os
+
+genai.configure(api_key=os.environ.get('GEMINI_API_KEY'))
+
+# Function to translate text using Gemini
+def translate(text, target_language):
+    model = genai.GenerativeModel("gemini-1.5-flash")  
+    try:
+        response = model.generate_content(
+            f"""You are a translator API. Your task is to translate the following text.
+
+CRITICAL INSTRUCTIONS:
+1. Translate the entire text as is, without adding or removing any characters or placeholders.
+2. Do NOT add any curly braces {{ }} that are not in the original text.
+3. Provide ONLY the translated text as your response.
+4. Do NOT include any markdown formatting, quotation marks, backticks, or extra newline characters in your response.
+5. Preserve the exact structure and formatting of the original text.
+
+Original text (in English):
+{text}
+
+Translate the above text to {target_language}. Remember, provide ONLY the direct translation without any modifications to the structure or added characters."""
+        )
+        print(response)
+        if response.parts:
+            return response.parts[0].text.strip()
+        else:
+            raise ValueError("No translation generated")
+    except Exception as e:
+        print(f"Translation error for '{text}': {str(e)}")
+        return text  # Return original text if translation fails
+
+def main():
+    language_dict = {
+        "de": "German",
+        "es": "Español",
+        "fr": "Français",
+        "it": "Italiano",
+        "ko": "Korean",
+        "nl": "Dutch",
+        "ro": "Romanian",
+        "tr": "Turkish",
+        "zh_CN": "Chinese Simplified",
+        "zh_TW": "Chinese Traditional",
+        "id": "Indonesian",
+        "pt": "Portuguese",
+        "vi": "Vietnamese",
+        "ja": "Japanese",
+        "ru": "Russian"
+    }
+    # Read the input JSON file
+    with open('../assets/flutter_i18n/en.json', 'r') as file:
+        en_data = json.load(file)
+
+    # Loop through each language in the dictionary
+    for lang_code, lang_name in language_dict.items():
+        # Load the existing language file or create an empty dictionary if it doesn't exist
+        try:
+            with open(f'../assets/flutter_i18n/{lang_code}.json', 'r') as file:
+                lang_data = json.load(file)
+        except FileNotFoundError:
+            lang_data = {}
+
+        # Find keys that are present in en.json but not in the current language file
+        new_entries = {key: en_data[key] for key in en_data if key not in lang_data}
+
+        # Translate the new entries
+        for key, value in new_entries.items():
+            lang_data[key] = translate(value, lang_name)
+            time.sleep(10)  # Pause for a bit between each translation r
+        with open(f'../assets/flutter_i18n/{lang_code}.json', 'w') as file:
+            json.dump(lang_data, file, ensure_ascii=False, indent=4)
+
+        print(f"Translation to {lang_name} complete. Check the '{lang_code}.json' file.")
+
+if __name__ == '__main__':
+    main()
+