From 4ddb2cf2d13bc21f425068ef0a1d8087ba0ebdbc Mon Sep 17 00:00:00 2001
From: unclebill <billbill290@gmail.com>
Date: Thu, 13 Jan 2022 14:35:42 +0800
Subject: [PATCH 1/4] fix(Flow): wrong color config

---
 packages/plugin-infra/src/web3-types.ts | 6 +++++-
 packages/plugins/Flow/src/constants.ts  | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/plugin-infra/src/web3-types.ts b/packages/plugin-infra/src/web3-types.ts
index ea66110d55ff..851c29537ab5 100644
--- a/packages/plugin-infra/src/web3-types.ts
+++ b/packages/plugin-infra/src/web3-types.ts
@@ -21,6 +21,10 @@ export enum TokenType {
     NonFungible = 'NonFungible',
 }
 
+type ColorRgb = `rgb(${number}, ${number}, ${number})`
+type ColorHex = `#${number}${number}${number}${number}${number}${number}` | `#${number}${number}${number}`
+type Color = ColorRgb | ColorHex
+
 export declare namespace Web3Plugin {
     /**
      * Plugin can declare what chain it supports to trigger side effects (e.g. create a new transaction).
@@ -47,7 +51,7 @@ export declare namespace Web3Plugin {
         /** The network icon */
         icon: URL
         /** The network icon in fixed color */
-        iconColor: string
+        iconColor: Color
         /** The network name */
         name: string
         /** Is a mainnet network */
diff --git a/packages/plugins/Flow/src/constants.ts b/packages/plugins/Flow/src/constants.ts
index b457746f1391..f9a5a1532d48 100644
--- a/packages/plugins/Flow/src/constants.ts
+++ b/packages/plugins/Flow/src/constants.ts
@@ -14,7 +14,7 @@ export const PLUGIN_NETWORKS: Web3Plugin.NetworkDescriptor[] = [
         type: NetworkType.Flow,
         name: 'Flow',
         icon: new URL('./assets/flow.png', import.meta.url),
-        iconColor: 'rgb(54 173 104)',
+        iconColor: 'rgb(54, 173, 104)',
         isMainnet: true,
     },
     {
@@ -24,7 +24,7 @@ export const PLUGIN_NETWORKS: Web3Plugin.NetworkDescriptor[] = [
         type: NetworkType.Flow,
         name: 'Flow Testnet',
         icon: new URL('./assets/flow.png', import.meta.url),
-        iconColor: 'rgb(54 173 104)',
+        iconColor: 'rgb(54, 173, 104)',
         isMainnet: false,
     },
 ]

From 3af847fbcb4b72743607d9169e482add686cfb6f Mon Sep 17 00:00:00 2001
From: unclebill <billbill290@gmail.com>
Date: Thu, 13 Jan 2022 15:05:08 +0800
Subject: [PATCH 2/4] fix: add rgba and hsl

---
 packages/plugin-infra/src/web3-types.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/plugin-infra/src/web3-types.ts b/packages/plugin-infra/src/web3-types.ts
index 851c29537ab5..fb9ab6d45b3a 100644
--- a/packages/plugin-infra/src/web3-types.ts
+++ b/packages/plugin-infra/src/web3-types.ts
@@ -22,8 +22,10 @@ export enum TokenType {
 }
 
 type ColorRgb = `rgb(${number}, ${number}, ${number})`
+type ColorRgba = `rgba(${number}, ${number}, ${number}, ${number})`
 type ColorHex = `#${number}${number}${number}${number}${number}${number}` | `#${number}${number}${number}`
-type Color = ColorRgb | ColorHex
+type ColorHsl = `hsl(${number}, ${number}%, ${number}%)`
+type Color = ColorRgb | ColorRgba | ColorHex | ColorHsl
 
 export declare namespace Web3Plugin {
     /**

From f84e5419db4b2a671257297891a36e5f982cbe53 Mon Sep 17 00:00:00 2001
From: unclebill <billbill290@gmail.com>
Date: Thu, 13 Jan 2022 15:13:12 +0800
Subject: [PATCH 3/4] fix: uppercase color format

---
 packages/plugin-infra/src/web3-types.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/plugin-infra/src/web3-types.ts b/packages/plugin-infra/src/web3-types.ts
index fb9ab6d45b3a..37d72725796f 100644
--- a/packages/plugin-infra/src/web3-types.ts
+++ b/packages/plugin-infra/src/web3-types.ts
@@ -21,11 +21,11 @@ export enum TokenType {
     NonFungible = 'NonFungible',
 }
 
-type ColorRgb = `rgb(${number}, ${number}, ${number})`
-type ColorRgba = `rgba(${number}, ${number}, ${number}, ${number})`
-type ColorHex = `#${number}${number}${number}${number}${number}${number}` | `#${number}${number}${number}`
-type ColorHsl = `hsl(${number}, ${number}%, ${number}%)`
-type Color = ColorRgb | ColorRgba | ColorHex | ColorHsl
+type ColorRGB = `rgb(${number}, ${number}, ${number})`
+type ColorRGBA = `rgba(${number}, ${number}, ${number}, ${number})`
+type ColorHEX = `#${number}${number}${number}${number}${number}${number}` | `#${number}${number}${number}`
+type ColorHSL = `hsl(${number}, ${number}%, ${number}%)`
+type Color = ColorRGB | ColorRGBA | ColorHEX | ColorHSL
 
 export declare namespace Web3Plugin {
     /**

From 7caf95b99619e6349387ff28d213ce4351a9703b Mon Sep 17 00:00:00 2001
From: unclebill <billbill290@gmail.com>
Date: Thu, 13 Jan 2022 15:22:22 +0800
Subject: [PATCH 4/4] fix: hex color typing

---
 packages/plugin-infra/src/web3-types.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/plugin-infra/src/web3-types.ts b/packages/plugin-infra/src/web3-types.ts
index 37d72725796f..4e428c0b264a 100644
--- a/packages/plugin-infra/src/web3-types.ts
+++ b/packages/plugin-infra/src/web3-types.ts
@@ -23,7 +23,7 @@ export enum TokenType {
 
 type ColorRGB = `rgb(${number}, ${number}, ${number})`
 type ColorRGBA = `rgba(${number}, ${number}, ${number}, ${number})`
-type ColorHEX = `#${number}${number}${number}${number}${number}${number}` | `#${number}${number}${number}`
+type ColorHEX = `#${string}${string}${string}${string}${string}${string}` | `#${string}${string}${string}`
 type ColorHSL = `hsl(${number}, ${number}%, ${number}%)`
 type Color = ColorRGB | ColorRGBA | ColorHEX | ColorHSL