diff --git a/.yarn/patches/@rive-app-canvas-patch-03752f0c3b.patch b/.yarn/patches/@rive-app-canvas-patch-03752f0c3b.patch new file mode 100644 index 000000000000..c875eb9faca3 --- /dev/null +++ b/.yarn/patches/@rive-app-canvas-patch-03752f0c3b.patch @@ -0,0 +1,54 @@ +diff --git a/rive.js b/rive.js +index 03eeff276d0495d77ce0c4715160db4b80a5fc87..79d6a4b12d62a12a4005e2d7f6f9249ce2ddeb55 100644 +--- a/rive.js ++++ b/rive.js +@@ -5418,7 +5418,7 @@ var RiveFile = /** @class */ (function () { + }); + } + else { +- this.fireLoadError(RiveFile.fileLoadErrorMessage); ++ // this.fireLoadError(RiveFile.fileLoadErrorMessage); + } + return [2 /*return*/]; + } +@@ -5433,7 +5433,8 @@ var RiveFile = /** @class */ (function () { + case 0: + // If no source file url specified, it's a bust + if (!this.src && !this.buffer) { +- this.fireLoadError(RiveFile.missingErrorMessage); ++ // this.fireLoadError(RiveFile.missingErrorMessage); ++ console.warn(RiveFile.missingErrorMessage); + return [2 /*return*/]; + } + _b.label = 1; +@@ -5452,7 +5453,8 @@ var RiveFile = /** @class */ (function () { + return [3 /*break*/, 5]; + case 4: + error_1 = _b.sent(); +- this.fireLoadError(error_1 instanceof Error ? error_1.message : RiveFile.fileLoadErrorMessage); ++ // this.fireLoadError(error_1 instanceof Error ? error_1.message : RiveFile.fileLoadErrorMessage); ++ console.warn(error_1 instanceof Error ? error_1.message : RiveFile.fileLoadErrorMessage); + return [3 /*break*/, 5]; + case 5: return [2 /*return*/]; + } +@@ -5464,7 +5466,8 @@ var RiveFile = /** @class */ (function () { + type: EventType.LoadError, + data: message, + }); +- throw new Error(message); ++ // throw new Error(message); ++ console.warn(message); + }; + /** + * Subscribe to Rive-generated events +@@ -5692,7 +5695,9 @@ var Rive = /** @class */ (function () { + this.riveFile = riveFile; + // If no source file url specified, it's a bust + if (!this.src && !this.buffer && !this.riveFile) { +- throw new RiveError(Rive.missingErrorMessage); ++ // throw new RiveError(Rive.missingErrorMessage); ++ console.warn(Rive.missingErrorMessage); ++ return; + } + // List of animations that should be initialized. + var startingAnimationNames = mapToStringArray(animations); diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 4bc99b92e73b..f5e2b3f7a9e0 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -4641,7 +4641,6 @@ export default class MetamaskController extends EventEmitter { return mnemonic; } catch (error) { - log.error('Error restoring social backup and getting seed phrase', error); if (error instanceof RecoveryError) { throw new JsonRpcError(-32603, error.message, error.data); } diff --git a/package.json b/package.json index 2f323bb88dea..5d1c984e64b8 100644 --- a/package.json +++ b/package.json @@ -242,7 +242,7 @@ "@endo/env-options@npm:^1.1.7": "patch:@endo/env-options@npm%3A1.1.11#~/.yarn/patches/@endo-env-options-npm-1.1.11-1b7fae374a.patch", "@endo/env-options@npm:^1.1.8": "patch:@endo/env-options@npm%3A1.1.11#~/.yarn/patches/@endo-env-options-npm-1.1.11-1b7fae374a.patch", "@metamask/jazzicon@npm:^2.0.0": "patch:@metamask/jazzicon@npm%3A2.0.0#~/.yarn/patches/@metamask-jazzicon-npm-2.0.0-36957be38d.patch", - "@rive-app/canvas@npm:2.31.5": "patch:@rive-app/canvas@patch%3A@rive-app/canvas@npm%253A2.31.5%23~/.yarn/patches/@rive-app-canvas-npm-2.31.5-df519c6e0f.patch%3A%3Aversion=2.31.5&hash=1ed092#~/.yarn/patches/@rive-app-canvas-patch-9b746e9393.patch" + "@rive-app/canvas@npm:2.31.5": "patch:@rive-app/canvas@patch%3A@rive-app/canvas@patch%253A@rive-app/canvas@npm%25253A2.31.5%2523~/.yarn/patches/@rive-app-canvas-npm-2.31.5-df519c6e0f.patch%253A%253Aversion=2.31.5&hash=1ed092%23~/.yarn/patches/@rive-app-canvas-patch-9b746e9393.patch%3A%3Aversion=2.31.5&hash=19c5d0#~/.yarn/patches/@rive-app-canvas-patch-03752f0c3b.patch" }, "dependencies": { "@babel/runtime": "patch:@babel/runtime@npm%3A7.25.9#~/.yarn/patches/@babel-runtime-npm-7.25.9-fe8c62510a.patch", diff --git a/ui/store/actions.ts b/ui/store/actions.ts index ed9ec4a64d5c..9da4db32bffa 100644 --- a/ui/store/actions.ts +++ b/ui/store/actions.ts @@ -639,7 +639,6 @@ export function restoreSocialBackupAndGetSeedPhrase( await forceUpdateMetamaskState(dispatch); return mnemonic; } catch (error) { - log.error('[restoreSocialBackupAndGetSeedPhrase] error', error); dispatch(displayWarning(error.message)); throw error; } diff --git a/yarn.lock b/yarn.lock index 08a88cefec1e..04566b6f7da2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10270,13 +10270,20 @@ __metadata: languageName: node linkType: hard -"@rive-app/canvas@patch:@rive-app/canvas@patch%3A@rive-app/canvas@npm%253A2.31.5%23~/.yarn/patches/@rive-app-canvas-npm-2.31.5-df519c6e0f.patch%3A%3Aversion=2.31.5&hash=1ed092#~/.yarn/patches/@rive-app-canvas-patch-9b746e9393.patch": +"@rive-app/canvas@patch:@rive-app/canvas@patch%3A@rive-app/canvas@npm%253A2.31.5%23~/.yarn/patches/@rive-app-canvas-npm-2.31.5-df519c6e0f.patch%3A%3Aversion=2.31.5&hash=1ed092#~/.yarn/patches/@rive-app-canvas-patch-9b746e9393.patch::version=2.31.5&hash=19c5d0": version: 2.31.5 resolution: "@rive-app/canvas@patch:@rive-app/canvas@patch%3A@rive-app/canvas@npm%253A2.31.5%23~/.yarn/patches/@rive-app-canvas-npm-2.31.5-df519c6e0f.patch%3A%3Aversion=2.31.5&hash=1ed092#~/.yarn/patches/@rive-app-canvas-patch-9b746e9393.patch::version=2.31.5&hash=19c5d0" checksum: 10/f8d4243fa29146bfa7958adf2284fd9a3d88a11c2f99a49b439da40d71ac710ad9a9737aeea628eff397889ec2256b4dd8fa547aa39ebc4f548eabcc488df60f languageName: node linkType: hard +"@rive-app/canvas@patch:@rive-app/canvas@patch%3A@rive-app/canvas@patch%253A@rive-app/canvas@npm%25253A2.31.5%2523~/.yarn/patches/@rive-app-canvas-npm-2.31.5-df519c6e0f.patch%253A%253Aversion=2.31.5&hash=1ed092%23~/.yarn/patches/@rive-app-canvas-patch-9b746e9393.patch%3A%3Aversion=2.31.5&hash=19c5d0#~/.yarn/patches/@rive-app-canvas-patch-03752f0c3b.patch": + version: 2.31.5 + resolution: "@rive-app/canvas@patch:@rive-app/canvas@patch%3A@rive-app/canvas@patch%253A@rive-app/canvas@npm%25253A2.31.5%2523~/.yarn/patches/@rive-app-canvas-npm-2.31.5-df519c6e0f.patch%253A%253Aversion=2.31.5&hash=1ed092%23~/.yarn/patches/@rive-app-canvas-patch-9b746e9393.patch%3A%3Aversion=2.31.5&hash=19c5d0#~/.yarn/patches/@rive-app-canvas-patch-03752f0c3b.patch::version=2.31.5&hash=410688" + checksum: 10/96e2414409aae7b87bbd06bbd643a8daa13c9a20444e0ca336328ba2a85aade5cad351076b1fb843d61627d1e2d7d7ee9cf943d1b198d800119024e3735d83dd + languageName: node + linkType: hard + "@rive-app/react-canvas@npm:4.23.3": version: 4.23.3 resolution: "@rive-app/react-canvas@npm:4.23.3"