From 601c7cd3e9d42ff93754bbc2f47876daf612091c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Nov 2023 17:35:52 +0100 Subject: [PATCH 1/2] chore: bump axios from 1.4.0 to 1.6.0 (#777) Bumps [axios](https://github.com/axios/axios) from 1.4.0 to 1.6.0. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.4.0...v1.6.0) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- apps/tx-builder/package.json | 2 +- package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/tx-builder/package.json b/apps/tx-builder/package.json index 1a6e62b0..c8dc576f 100644 --- a/apps/tx-builder/package.json +++ b/apps/tx-builder/package.json @@ -10,7 +10,7 @@ "@material-ui/lab": "^4.0.0-alpha.60", "@safe-global/safe-apps-provider": "^0.18.0", "@safe-global/safe-deployments": "^1.26.0", - "axios": "^1.4.0", + "axios": "^1.6.0", "evm-proxy-detection": "1.0.0", "localforage": "^1.10.0", "react-beautiful-dnd": "^13.1.1", diff --git a/package.json b/package.json index 9811b818..a6a7c2ac 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "@typescript-eslint/eslint-plugin": "^5.49.0", "@typescript-eslint/parser": "^5.49.0", "assert": "^2.0.0", - "axios": "^1.4.0", + "axios": "^1.6.0", "buffer": "^6.0.3", "commitizen": "^4.3.0", "crypto-browserify": "^3.12.0", diff --git a/yarn.lock b/yarn.lock index 81951583..e4a65673 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4988,10 +4988,10 @@ axios@^0.21.1: dependencies: follow-redirects "^1.14.0" -axios@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.4.0.tgz#38a7bf1224cd308de271146038b551d725f0be1f" - integrity sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA== +axios@^1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.0.tgz#f1e5292f26b2fd5c2e66876adc5b06cdbd7d2102" + integrity sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg== dependencies: follow-redirects "^1.15.0" form-data "^4.0.0" From 87fd5eb1c277d87fec8c3b8f5b157f44b2e7ec82 Mon Sep 17 00:00:00 2001 From: Manuel Gellfart Date: Wed, 29 Nov 2023 11:23:11 +0100 Subject: [PATCH 2/2] fix(ramp-network): upgrade SDK to 4.0.4 (#778) The old sdk was using a deprecated ramp URL. The new SDK fixes this. --- apps/ramp-network/package.json | 2 +- apps/ramp-network/src/App.tsx | 3 +-- apps/ramp-network/src/ramp.ts | 4 +--- yarn.lock | 18 +++++++++--------- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/apps/ramp-network/package.json b/apps/ramp-network/package.json index 57a8ae59..12b28d18 100644 --- a/apps/ramp-network/package.json +++ b/apps/ramp-network/package.json @@ -6,7 +6,7 @@ "dependencies": { "@gnosis.pm/safe-react-components": "^0.9.7", "@material-ui/core": "^4.12.4", - "@ramp-network/ramp-instant-sdk": "^3.0.0" + "@ramp-network/ramp-instant-sdk": "^4.0.4" }, "scripts": { "start": "react-app-rewired start", diff --git a/apps/ramp-network/src/App.tsx b/apps/ramp-network/src/App.tsx index 9b35719f..1093c3fd 100644 --- a/apps/ramp-network/src/App.tsx +++ b/apps/ramp-network/src/App.tsx @@ -3,7 +3,7 @@ import { useSafeAppsSDK } from '@safe-global/safe-apps-react-sdk' import { Title, Loader, Text } from '@gnosis.pm/safe-react-components' import { ChainInfo } from '@safe-global/safe-apps-sdk' import { goBack } from './utils' -import { ASSETS_BY_CHAIN, getRampWidgetUrl, initializeRampWidget } from './ramp' +import { ASSETS_BY_CHAIN, initializeRampWidget } from './ramp' import styled from 'styled-components' const Container = styled.div` @@ -45,7 +45,6 @@ const SafeApp = (): React.ReactElement | null => { useEffect(() => { if (chainInfo && safe && isChainSupported) { initializeRampWidget({ - url: getRampWidgetUrl(chainInfo), address: safe.safeAddress, assets: ASSETS_BY_CHAIN[chainInfo.chainId], onClose: goBack, diff --git a/apps/ramp-network/src/ramp.ts b/apps/ramp-network/src/ramp.ts index 4ae37c3a..0fae5b08 100644 --- a/apps/ramp-network/src/ramp.ts +++ b/apps/ramp-network/src/ramp.ts @@ -20,15 +20,13 @@ export const getRampWidgetUrl = (chainInfo: ChainInfo) => { } type RampWidgetInitializer = { - url?: string assets: string address: string onClose?: () => void } -export const initializeRampWidget = ({ url, assets, address, onClose }: RampWidgetInitializer) => { +export const initializeRampWidget = ({ assets, address, onClose }: RampWidgetInitializer) => { return new RampInstantSDK({ - url, hostAppName: 'Ramp Network Safe App', hostLogoUrl: 'https://docs.ramp.network/img/logo-1.svg', swapAsset: assets, diff --git a/yarn.lock b/yarn.lock index e4a65673..f98bdd48 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2845,12 +2845,12 @@ resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.6.tgz#cee20bd55e68a1720bdab363ecf0c821ded4cd45" integrity sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw== -"@ramp-network/ramp-instant-sdk@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@ramp-network/ramp-instant-sdk/-/ramp-instant-sdk-3.0.0.tgz#b4553d80563f98952ef28df42d266ca2d3fe53a9" - integrity sha512-wkP87bkTabPs6VPeuRe4tVB1M4NF5NdhgkglExC38LYZXOmyfw0UF5MVpLiIAezUDiDqOhzgBnJxX3QvbeS2kA== +"@ramp-network/ramp-instant-sdk@^4.0.4": + version "4.0.4" + resolved "https://registry.yarnpkg.com/@ramp-network/ramp-instant-sdk/-/ramp-instant-sdk-4.0.4.tgz#25e1327ff2aead8bbab3c1cb5257da9041867442" + integrity sha512-Kkn+xwc4EbD2YqXOOQChZCqRT8/DM8sh9Qnz1nI2+/ACdo3INc42FMubgw5aZlyBzuF32XL/xdZyWBGPF4vECg== dependencies: - body-scroll-lock "^2.6.4" + body-scroll-lock "^3.1.5" "@remix-run/router@1.0.3": version "1.0.3" @@ -5299,10 +5299,10 @@ body-parser@1.19.2, body-parser@^1.16.0: raw-body "2.4.3" type-is "~1.6.18" -body-scroll-lock@^2.6.4: - version "2.7.1" - resolved "https://registry.yarnpkg.com/body-scroll-lock/-/body-scroll-lock-2.7.1.tgz#caf3f9c91773af1ffb684cd66ed9137b5b737014" - integrity sha512-hS53SQ8RhM0e4DsQ3PKz6Gr2O7Kpdh59TWU98GHjaQznL7y4dFycEPk7pFQAikqBaUSCArkc5E3pe7CWIt2fZA== +body-scroll-lock@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/body-scroll-lock/-/body-scroll-lock-3.1.5.tgz#c1392d9217ed2c3e237fee1e910f6cdd80b7aaec" + integrity sha512-Yi1Xaml0EvNA0OYWxXiYNqY24AfWkbA6w5vxE7GWxtKfzIbZM+Qw+aSmkgsbWzbHiy/RCSkUZBplVxTA+E4jJg== bonjour@^3.5.0: version "3.5.0"