From 789a86fccaa1b5f7b075773e9d0fb7cd0ee43f41 Mon Sep 17 00:00:00 2001 From: georgeweiler Date: Mon, 3 Feb 2025 10:03:11 -0700 Subject: [PATCH 1/4] feat: upgrades ramp sdk to 2.0.3 --- .../UI/Ramp/Views/Quotes/Quotes.test.tsx | 4 ++-- app/components/UI/Ramp/hooks/useQuotes.ts | 2 +- package.json | 8 +++---- yarn.lock | 24 +++++++++---------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/components/UI/Ramp/Views/Quotes/Quotes.test.tsx b/app/components/UI/Ramp/Views/Quotes/Quotes.test.tsx index 22c84f9f7ad..d7ea969ad8d 100644 --- a/app/components/UI/Ramp/Views/Quotes/Quotes.test.tsx +++ b/app/components/UI/Ramp/Views/Quotes/Quotes.test.tsx @@ -159,7 +159,7 @@ describe('Quotes', () => { mockUseQuotesValues = { ...mockUseQuotesInitialValues, isFetching: true, - data: null, + data: undefined, }; render(Quotes); expect(mockSetOptions).toBeCalledTimes(1); @@ -200,7 +200,7 @@ describe('Quotes', () => { mockUseQuotesValues = { ...mockUseQuotesInitialValues, isFetching: true, - data: null, + data: undefined, }; render(Quotes); const fetchingQuotesText = screen.getByText('Fetching quotes'); diff --git a/app/components/UI/Ramp/hooks/useQuotes.ts b/app/components/UI/Ramp/hooks/useQuotes.ts index eea49507946..070ad16d9d5 100644 --- a/app/components/UI/Ramp/hooks/useQuotes.ts +++ b/app/components/UI/Ramp/hooks/useQuotes.ts @@ -21,7 +21,7 @@ function useQuotes(amount: number | string) { ); return { - data, + data: data?.quotes, isFetching, error, query, diff --git a/package.json b/package.json index cf4b6a25602..1984660e47e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "metamask", - "version": "7.38.1", + "version": "7.38.0", "private": true, "scripts": { "audit:ci": "./scripts/yarn-audit.sh", @@ -145,7 +145,7 @@ }, "dependencies": { "@config-plugins/detox": "^8.0.0", - "@consensys/on-ramp-sdk": "1.28.8", + "@consensys/on-ramp-sdk": "^2.0.3", "@keystonehq/bc-ur-registry-eth": "^0.19.1", "@keystonehq/metamask-airgapped-keyring": "^0.13.1", "@keystonehq/ur-decoder": "^0.12.2", @@ -207,7 +207,7 @@ "@metamask/snaps-sdk": "^6.13.0", "@metamask/snaps-utils": "^8.6.1", "@metamask/solana-wallet-snap": "^1.2.0", - "@metamask/stake-sdk": "^0.6.0", + "@metamask/stake-sdk": "^0.3.0", "@metamask/swappable-obj-proxy": "^2.1.0", "@metamask/swaps-controller": "^12.0.0", "@metamask/transaction-controller": "^43.0.0", @@ -216,7 +216,7 @@ "@notifee/react-native": "^9.0.0", "@react-native-async-storage/async-storage": "^1.23.1", "@react-native-clipboard/clipboard": "1.8.4", - "@react-native-community/blur": "^4.4.1", + "@react-native-community/blur": "^4.4.0", "@react-native-community/checkbox": "^0.5.17", "@react-native-community/datetimepicker": "^7.5.0", "@react-native-community/netinfo": "^9.5.0", diff --git a/yarn.lock b/yarn.lock index dbb50f31043..164afe672fb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1429,10 +1429,10 @@ dependencies: expo-build-properties "~0.12.1" -"@consensys/on-ramp-sdk@1.28.8": - version "1.28.8" - resolved "https://registry.yarnpkg.com/@consensys/on-ramp-sdk/-/on-ramp-sdk-1.28.8.tgz#e39d833974d9d49653a2ec107ffbebadb49580d1" - integrity sha512-snm1hGjIaFMHvB7seLoaBgUQXH1n8/iXPMSm96d5QItFKVw4GZyqsKRnuT2u/CwIeXtYOKf59q7+Lp0UMg+mFQ== +"@consensys/on-ramp-sdk@^2.0.3": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@consensys/on-ramp-sdk/-/on-ramp-sdk-2.0.3.tgz#c4a9068c75e9a2e7bb8b33071900d6f1388bab69" + integrity sha512-zMNefDC6xGu8vuo/WRxQvsvaEmqRdOCs4afv8yaCRaDalnds4l9ph4lcs+NLrdJFUYjKMo8Y+pU8SidSUug0Wg== dependencies: async "^3.2.3" axios "^0.28.0" @@ -5543,10 +5543,10 @@ resolved "https://registry.yarnpkg.com/@metamask/solana-wallet-snap/-/solana-wallet-snap-1.2.0.tgz#7d0db28a58cbd728306427144039d28f56f6d477" integrity sha512-XG1NzrJu2Xvo6PKr5f3Ij6ojEBNGh1H/2WJCcCMSoKZUEl8UG5i8rmZ+SVcZJ0Jhr88sbredNXlAzqGESz2VBA== -"@metamask/stake-sdk@^0.6.0": - version "0.6.0" - resolved "https://registry.npmjs.org/@metamask/stake-sdk/-/stake-sdk-0.6.0.tgz#f147debfc0179de4ff3814a406bcbc0144f432fa" - integrity sha512-y8NUie7yrMTqTOk4QStV2RJnRKJQ/B2I7wj/eSuH5naIivFuknunyiRKyUs5U4kPlTwCiNXaY+JytISjIxC+7w== +"@metamask/stake-sdk@^0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@metamask/stake-sdk/-/stake-sdk-0.3.0.tgz#b6156fd29666bfb9482a89b555cfe70b2b63769a" + integrity sha512-i0QkzEc/7HRpVJbhe+qPORprQaMsuzRBpSgFjKgxbsLhz4YtYVDTgVJ5kesZXNy2KfprYTfeh4oV/jenQWgNJA== "@metamask/superstruct@^3.1.0": version "3.1.0" @@ -6479,10 +6479,10 @@ resolved "https://registry.yarnpkg.com/@react-native-clipboard/clipboard/-/clipboard-1.8.4.tgz#4bc1fb00643688e489d8220cd635844ab5c066f9" integrity sha512-poFq3RvXzkbXcqoQNssbZ+aNbCRzBFAWkR9QL7u9xNMgsyWZtk7d16JQoaBo8D2E+kKi+/9JOiVQzA5w+9N67w== -"@react-native-community/blur@^4.4.1": - version "4.4.1" - resolved "https://registry.yarnpkg.com/@react-native-community/blur/-/blur-4.4.1.tgz#72cbc0be5a84022c33091683ec6888925ebcca6e" - integrity sha512-XBSsRiYxE/MOEln2ayunShfJtWztHwUxLFcSL20o+HNNRnuUDv+GXkF6FmM2zE8ZUfrnhQ/zeTqvnuDPGw6O8A== +"@react-native-community/blur@^4.4.0": + version "4.4.0" + resolved "https://registry.yarnpkg.com/@react-native-community/blur/-/blur-4.4.0.tgz#b2440dab17d94e480fbc4470e03155573b5b7375" + integrity sha512-P+xdT2LIq1ewOsF3zx7C0nu4dj7nxl2NVTsMXEzRDjM3bWMdrrEbTRA7uwPV5ngn7/BXIommBPlT/JW4SAedrw== "@react-native-community/checkbox@^0.5.17": version "0.5.17" From a24baa1a36027336199b6b60c6933fd65049ee5e Mon Sep 17 00:00:00 2001 From: georgeweiler Date: Mon, 3 Feb 2025 10:13:04 -0700 Subject: [PATCH 2/4] chore: fix yarn lock diff --- yarn.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index 164afe672fb..db3af5756e7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5543,10 +5543,10 @@ resolved "https://registry.yarnpkg.com/@metamask/solana-wallet-snap/-/solana-wallet-snap-1.2.0.tgz#7d0db28a58cbd728306427144039d28f56f6d477" integrity sha512-XG1NzrJu2Xvo6PKr5f3Ij6ojEBNGh1H/2WJCcCMSoKZUEl8UG5i8rmZ+SVcZJ0Jhr88sbredNXlAzqGESz2VBA== -"@metamask/stake-sdk@^0.3.0": - version "0.3.0" - resolved "https://registry.yarnpkg.com/@metamask/stake-sdk/-/stake-sdk-0.3.0.tgz#b6156fd29666bfb9482a89b555cfe70b2b63769a" - integrity sha512-i0QkzEc/7HRpVJbhe+qPORprQaMsuzRBpSgFjKgxbsLhz4YtYVDTgVJ5kesZXNy2KfprYTfeh4oV/jenQWgNJA== +"@metamask/stake-sdk@^0.6.0": + version "0.6.0" + resolved "https://registry.npmjs.org/@metamask/stake-sdk/-/stake-sdk-0.6.0.tgz#f147debfc0179de4ff3814a406bcbc0144f432fa" + integrity sha512-y8NUie7yrMTqTOk4QStV2RJnRKJQ/B2I7wj/eSuH5naIivFuknunyiRKyUs5U4kPlTwCiNXaY+JytISjIxC+7w== "@metamask/superstruct@^3.1.0": version "3.1.0" @@ -6479,10 +6479,10 @@ resolved "https://registry.yarnpkg.com/@react-native-clipboard/clipboard/-/clipboard-1.8.4.tgz#4bc1fb00643688e489d8220cd635844ab5c066f9" integrity sha512-poFq3RvXzkbXcqoQNssbZ+aNbCRzBFAWkR9QL7u9xNMgsyWZtk7d16JQoaBo8D2E+kKi+/9JOiVQzA5w+9N67w== -"@react-native-community/blur@^4.4.0": - version "4.4.0" - resolved "https://registry.yarnpkg.com/@react-native-community/blur/-/blur-4.4.0.tgz#b2440dab17d94e480fbc4470e03155573b5b7375" - integrity sha512-P+xdT2LIq1ewOsF3zx7C0nu4dj7nxl2NVTsMXEzRDjM3bWMdrrEbTRA7uwPV5ngn7/BXIommBPlT/JW4SAedrw== +"@react-native-community/blur@^4.4.1": + version "4.4.1" + resolved "https://registry.yarnpkg.com/@react-native-community/blur/-/blur-4.4.1.tgz#72cbc0be5a84022c33091683ec6888925ebcca6e" + integrity sha512-XBSsRiYxE/MOEln2ayunShfJtWztHwUxLFcSL20o+HNNRnuUDv+GXkF6FmM2zE8ZUfrnhQ/zeTqvnuDPGw6O8A== "@react-native-community/checkbox@^0.5.17": version "0.5.17" From 9f9ede1add55e980efd408d89f090e3f45130798 Mon Sep 17 00:00:00 2001 From: georgeweiler Date: Mon, 3 Feb 2025 10:14:53 -0700 Subject: [PATCH 3/4] chore: fix package json diff --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 1984660e47e..0ff54dc0b7f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "metamask", - "version": "7.38.0", + "version": "7.38.1", "private": true, "scripts": { "audit:ci": "./scripts/yarn-audit.sh", @@ -207,7 +207,7 @@ "@metamask/snaps-sdk": "^6.13.0", "@metamask/snaps-utils": "^8.6.1", "@metamask/solana-wallet-snap": "^1.2.0", - "@metamask/stake-sdk": "^0.3.0", + "@metamask/stake-sdk": "^0.6.0", "@metamask/swappable-obj-proxy": "^2.1.0", "@metamask/swaps-controller": "^12.0.0", "@metamask/transaction-controller": "^43.0.0", @@ -216,7 +216,7 @@ "@notifee/react-native": "^9.0.0", "@react-native-async-storage/async-storage": "^1.23.1", "@react-native-clipboard/clipboard": "1.8.4", - "@react-native-community/blur": "^4.4.0", + "@react-native-community/blur": "^4.4.1", "@react-native-community/checkbox": "^0.5.17", "@react-native-community/datetimepicker": "^7.5.0", "@react-native-community/netinfo": "^9.5.0", From e22098f09e30559bbf8587a38dcdf76af09c5962 Mon Sep 17 00:00:00 2001 From: georgeweiler Date: Tue, 4 Feb 2025 06:13:10 -0700 Subject: [PATCH 4/4] chore: upgrades sdk to 2.0.4 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index b15d453aa53..982caa2f3b5 100644 --- a/package.json +++ b/package.json @@ -145,7 +145,7 @@ }, "dependencies": { "@config-plugins/detox": "^8.0.0", - "@consensys/on-ramp-sdk": "^2.0.3", + "@consensys/on-ramp-sdk": "^2.0.4", "@keystonehq/bc-ur-registry-eth": "^0.19.1", "@keystonehq/metamask-airgapped-keyring": "^0.13.1", "@keystonehq/ur-decoder": "^0.12.2", diff --git a/yarn.lock b/yarn.lock index 3c7063bca72..c4b788d2ec9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1429,10 +1429,10 @@ dependencies: expo-build-properties "~0.12.1" -"@consensys/on-ramp-sdk@^2.0.3": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@consensys/on-ramp-sdk/-/on-ramp-sdk-2.0.3.tgz#c4a9068c75e9a2e7bb8b33071900d6f1388bab69" - integrity sha512-zMNefDC6xGu8vuo/WRxQvsvaEmqRdOCs4afv8yaCRaDalnds4l9ph4lcs+NLrdJFUYjKMo8Y+pU8SidSUug0Wg== +"@consensys/on-ramp-sdk@^2.0.4": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@consensys/on-ramp-sdk/-/on-ramp-sdk-2.0.4.tgz#5068e1059510428bedff42e101bfc3a9060b1756" + integrity sha512-T8HsVlUe3hlC1c6umAT7nF4QG7oL7l0xgKTs7vob3bsVTNnnIo4uMsEYTbCI9El8gAnKiC9xHlXAZT9cXouFlA== dependencies: async "^3.2.3" axios "^0.28.0"