From df509a75054ec3ec2be0a1cd2a78d580a0208a0a Mon Sep 17 00:00:00 2001
From: wuyueyang <wuyueyang@mixin.one>
Date: Wed, 23 Oct 2024 14:43:37 +0800
Subject: [PATCH 1/3] Show chain tag for Base chain

---
 MixinServices/MixinServices/Database/User/Model/TokenItem.swift | 2 ++
 MixinServices/MixinServices/Services/ChainID.swift              | 1 +
 2 files changed, 3 insertions(+)

diff --git a/MixinServices/MixinServices/Database/User/Model/TokenItem.swift b/MixinServices/MixinServices/Database/User/Model/TokenItem.swift
index 55550af73c..1529a11a1a 100644
--- a/MixinServices/MixinServices/Database/User/Model/TokenItem.swift
+++ b/MixinServices/MixinServices/Database/User/Model/TokenItem.swift
@@ -160,6 +160,8 @@ extension TokenItem {
             "Polygon"
         case ChainID.solana:
             "Solana"
+        case ChainID.base:
+            "Base"
         default:
             nil
         }
diff --git a/MixinServices/MixinServices/Services/ChainID.swift b/MixinServices/MixinServices/Services/ChainID.swift
index d4ec9d4788..d914f906c5 100644
--- a/MixinServices/MixinServices/Services/ChainID.swift
+++ b/MixinServices/MixinServices/Services/ChainID.swift
@@ -15,5 +15,6 @@ public enum ChainID {
     public static let arbitrum = "d0688ff7-6656-4a79-bd5f-d764bfa9bc46"
     public static let optimism = "62d5b01f-24ee-4c96-8214-8e04981d05f2"
     public static let solana = "64692c23-8971-4cf4-84a7-4dd1271dd887"
+    public static let base = "3fb612c5-6844-3979-ae4a-5a84e79da870"
     
 }

From 072e2c0514d2671ef81026530312f919ab512d73 Mon Sep 17 00:00:00 2001
From: wuyueyang <wuyueyang@mixin.one>
Date: Wed, 23 Oct 2024 14:55:34 +0800
Subject: [PATCH 2/3] Show chain tag in swap

---
 Mixin/Service/API/Model/SwappableToken.swift | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Mixin/Service/API/Model/SwappableToken.swift b/Mixin/Service/API/Model/SwappableToken.swift
index e1673b8d02..224062851a 100644
--- a/Mixin/Service/API/Model/SwappableToken.swift
+++ b/Mixin/Service/API/Model/SwappableToken.swift
@@ -61,6 +61,8 @@ extension SwappableToken {
             "Polygon"
         case ChainID.solana:
             "Solana"
+        case ChainID.base:
+            "Base"
         default:
             nil
         }

From cfc6a8e86c40d567014622ffc0153356ecf39d72 Mon Sep 17 00:00:00 2001
From: wuyueyang <wuyueyang@mixin.one>
Date: Wed, 23 Oct 2024 15:22:27 +0800
Subject: [PATCH 3/3] Show chain tag for ETH on Base

---
 Mixin/Service/API/Model/SwappableToken.swift                  | 4 ++--
 .../MixinServices/Database/User/Model/TokenItem.swift         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Mixin/Service/API/Model/SwappableToken.swift b/Mixin/Service/API/Model/SwappableToken.swift
index 224062851a..61a11c7c54 100644
--- a/Mixin/Service/API/Model/SwappableToken.swift
+++ b/Mixin/Service/API/Model/SwappableToken.swift
@@ -47,6 +47,8 @@ extension SwappableToken {
         switch chain.chainID {
         case ChainID.bnbSmartChain:
             "BEP-20"
+        case ChainID.base:
+            "Base"
         case assetID:
             nil
         case ChainID.ethereum:
@@ -61,8 +63,6 @@ extension SwappableToken {
             "Polygon"
         case ChainID.solana:
             "Solana"
-        case ChainID.base:
-            "Base"
         default:
             nil
         }
diff --git a/MixinServices/MixinServices/Database/User/Model/TokenItem.swift b/MixinServices/MixinServices/Database/User/Model/TokenItem.swift
index 1529a11a1a..74d19d402a 100644
--- a/MixinServices/MixinServices/Database/User/Model/TokenItem.swift
+++ b/MixinServices/MixinServices/Database/User/Model/TokenItem.swift
@@ -148,6 +148,8 @@ extension TokenItem {
         switch chainID {
         case ChainID.bnbSmartChain:
             "BEP-20"
+        case ChainID.base:
+            "Base"
         case assetID:
             nil
         case ChainID.ethereum:
@@ -160,8 +162,6 @@ extension TokenItem {
             "Polygon"
         case ChainID.solana:
             "Solana"
-        case ChainID.base:
-            "Base"
         default:
             nil
         }