Merge branch 'main' into json-rpc-middleware-12

Author: tommasini

app/components/Base/StatusText.js

@@ -29,7 +29,7 @@ export const PendingText = (props) => {
   return (
     <Text
       bold
-      style={[styles.status, { color: colors.secondary.default }]}
+      style={[styles.status, { color: colors.warning.default }]}
       {...props}
     />
   );

app/components/Base/Text/Text.styles.ts

@@ -21,7 +21,7 @@ const createStyles = (colors: Colors) =>
       color: colors.error.default,
     },
     orange: {
-      color: colors.secondary.default,
+      color: colors.warning.default,
     },
     black: {
       color: colors.text.default,

app/components/UI/StyledButton/__snapshots__/index.test.tsx.snap

@@ -91,7 +91,7 @@ exports[`StyledButton should render correctly on Android the button with type or
           "padding": 15,
         },
         {
-          "borderColor": "#F66A0A",
+          "borderColor": "#BF5208",
           "borderWidth": 1,
         },
         null,
@@ -223,7 +223,7 @@ exports[`StyledButton should render correctly on iOS the button with type orange
         "padding": 15,
       },
       {
-        "borderColor": "#F66A0A",
+        "borderColor": "#BF5208",
         "borderWidth": 1,
       },
       undefined,
@@ -239,7 +239,7 @@ exports[`StyledButton should render correctly on iOS the button with type orange
         "textAlign": "center",
       },
       {
-        "color": "#F66A0A",
+        "color": "#BF5208",
       },
       undefined,
     ]

app/components/UI/StyledButton/styledButtonStyles.js

@@ -20,11 +20,11 @@ const createStyles = (colors) =>
       color: colors.primary.inverse,
     },
     orange: {
-      borderColor: colors.secondary.default,
+      borderColor: colors.warning.default,
       borderWidth: 1,
     },
     orangeText: {
-      color: colors.secondary.default,
+      color: colors.warning.default,
     },
     infoText: {
       color: colors.primary.default,

app/components/Views/confirmations/components/TransactionReview/TransactionReviewEIP1559/index.js

@@ -33,7 +33,7 @@ const createStyles = (colors) =>
       paddingLeft: 2,
     },
     gasInfoIcon: (hasOrigin) => ({
-      color: hasOrigin ? colors.secondary.default : colors.icon.muted,
+      color: hasOrigin ? colors.warning.default : colors.icon.muted,
     }),
     amountContainer: {
       flex: 1,

app/components/Views/confirmations/components/TransactionReview/TransactionReviewEIP1559Update/styles.ts

@@ -16,7 +16,7 @@ const createStyles = (colors: any) =>
       paddingLeft: 2,
     },
     gasInfoIcon: (hasOrigin) => ({
-      color: hasOrigin ? colors.secondary.default : colors.icon.muted,
+      color: hasOrigin ? colors.warning.default : colors.icon.muted,
     }),
     amountContainer: {
       flex: 1,

package.json

@@ -170,7 +170,7 @@
     "@metamask/rpc-errors": "^6.2.1",
     "@metamask/scure-bip39": "^2.1.0",
     "@metamask/sdk-communication-layer": "^0.20.2",
-    "@metamask/signature-controller": "^14.0.0",
+    "@metamask/signature-controller": "^16.0.0",
     "@metamask/slip44": "3.1.0",
     "@metamask/snaps-controllers": "^8.3.1",
     "@metamask/snaps-rpc-methods": "^9.0.0",

yarn.lock

@@ -3603,7 +3603,7 @@
     "@metamask/utils" "^8.3.0"
     nanoid "^3.1.31"
 
-"@metamask/approval-controller@^6.0.1", "@metamask/approval-controller@^6.0.2":
+"@metamask/approval-controller@^6.0.2":
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/@metamask/approval-controller/-/approval-controller-6.0.2.tgz#2bae3c293b73e8ecaf8cbba11fbc99c61adb4367"
   integrity sha512-G5FmEwRkKJPjCh3sA6g8eoYOcmLj/Y6Kllh663fYYbt1DZHHJtkrWBuaUnbTySS0VYqbTInpcgSRzuawE1VMgw==
@@ -4160,25 +4160,6 @@
     ethereumjs-wallet "^1.0.1"
     immer "^9.0.6"
 
-"@metamask/keyring-controller@^14.0.1":
-  version "14.0.1"
-  resolved "https://registry.yarnpkg.com/@metamask/keyring-controller/-/keyring-controller-14.0.1.tgz#019596a29a59d1b7cdc806c096bf3cba254e2657"
-  integrity sha512-lK4Zf5ek+eqstnPEQ6pwJPzj4Zt79in0atN2ttUPZi3IN/Xw5Il4nLrTQSSpcAxDwSble1hJibGTOPXAVA+lRg==
-  dependencies:
-    "@ethereumjs/util" "^8.1.0"
-    "@keystonehq/metamask-airgapped-keyring" "^0.13.1"
-    "@metamask/base-controller" "^5.0.1"
-    "@metamask/browser-passworder" "^4.3.0"
-    "@metamask/eth-hd-keyring" "^7.0.1"
-    "@metamask/eth-sig-util" "^7.0.1"
-    "@metamask/eth-simple-keyring" "^6.0.1"
-    "@metamask/keyring-api" "^3.0.0"
-    "@metamask/message-manager" "^8.0.1"
-    "@metamask/utils" "^8.3.0"
-    async-mutex "^0.2.6"
-    ethereumjs-wallet "^1.0.1"
-    immer "^9.0.6"
-
 "@metamask/keyring-controller@^16.0.0":
   version "16.0.0"
   resolved "https://registry.yarnpkg.com/@metamask/keyring-controller/-/keyring-controller-16.0.0.tgz#36530a5cbc311d496ef66701c66daf779a769fca"
@@ -4220,7 +4201,7 @@
     jsonschema "^1.2.4"
     uuid "^8.3.2"
 
-"@metamask/message-manager@^8.0.1", "@metamask/message-manager@^8.0.2":
+"@metamask/message-manager@^8.0.2":
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/@metamask/message-manager/-/message-manager-8.0.2.tgz#84720f0fe9e0c02cc97b76f0bc8f3d5b0a25f731"
   integrity sha512-6o0FRWzmOv5ClYv9QfSJI6LtUJaQokwhVROTV2gLsuoAns8a9NuiHmXZrBh1tdjYifXPoPh74nqim4XBBT+GQQ==
@@ -4652,17 +4633,17 @@
     utf-8-validate "^6.0.3"
     uuid "^8.3.2"
 
-"@metamask/signature-controller@^14.0.0":
-  version "14.0.1"
-  resolved "https://registry.yarnpkg.com/@metamask/signature-controller/-/signature-controller-14.0.1.tgz#3add95d378f7b398f29945b33b0ef4dd3503808e"
-  integrity sha512-ZBkrpRjo4KYD/bulmDk4MscgKDOGlcLHSXudHTtQRMeg+2HVXGk4ZRyvHohxkT0B4vvex2uVMXk9iyLfc2/Tgg==
+"@metamask/signature-controller@^16.0.0":
+  version "16.0.0"
+  resolved "https://registry.yarnpkg.com/@metamask/signature-controller/-/signature-controller-16.0.0.tgz#78c7f23d02da99d4e953eb9b4e8e2909523a3288"
+  integrity sha512-6KOzkBxqivKXexJLjcaE9bGjh2vSKO3JsOjE1KD9Mkcx8qxDJOaXft+FJSs2XhJgi5FoyjRgfhryukszl+tCIg==
   dependencies:
-    "@metamask/approval-controller" "^6.0.1"
-    "@metamask/base-controller" "^5.0.1"
-    "@metamask/controller-utils" "^9.0.1"
-    "@metamask/keyring-controller" "^14.0.1"
+    "@metamask/approval-controller" "^6.0.2"
+    "@metamask/base-controller" "^5.0.2"
+    "@metamask/controller-utils" "^9.1.0"
+    "@metamask/keyring-controller" "^16.0.0"
     "@metamask/logging-controller" "^3.0.1"
-    "@metamask/message-manager" "^8.0.1"
+    "@metamask/message-manager" "^8.0.2"
     "@metamask/rpc-errors" "^6.2.1"
     "@metamask/utils" "^8.3.0"
     lodash "^4.17.21"