Eren0180 · Eren0180 · Mar 13, 2023 · Mar 14, 2023 · Mar 15, 2023 · Mar 15, 2023
diff --git a/.github/actions/release/action.yml b/.github/actions/release/action.yml
@@ -33,6 +33,12 @@ inputs:
   react-app-mmi-environment:
     description: MMI environment
     required: true
+  react-app-walletconnect-project-id:
+    description: WalletConnect Project ID
+    required: true
+  react-app-ramp-api:
+    description: Ramp network API Key
+    required: true
 
 runs:
   using: composite
@@ -63,6 +69,7 @@ runs:
         REACT_APP_MMI_BACKEND_BASE_URL: ${{ inputs.react-app-mmi-backend-base-url }}
         REACT_APP_MMI_ENVIRONMENT: ${{ inputs.react-app-mmi-environment }}
         REACT_APP_WALLETCONNECT_PROJECT_ID: ${{ inputs.react-app-walletconnect-project-id }}
+        REACT_APP_RAMP_APIKEY: ${{ inputs.react-app-ramp-api }}
 
     - name: Push changes
       uses: ad-m/github-push-action@8407731efefc0d8f72af254c74276b7a90be36e1

diff --git a/.github/actions/setup-env/action.yml b/.github/actions/setup-env/action.yml
@@ -6,7 +6,7 @@ inputs:
   node-version:
     description: Node.js version
     required: false
-    default: '16'
+    default: 18
   aws-secret-access-key:
     description: AWS secret access key
     required: true
@@ -32,7 +32,9 @@ runs:
       run: |
         sudo apt-get update
         sudo apt-get -y install python3-pip python3-dev
-        pip install awscli --upgrade --user
+        python -m venv venv
+        source venv/bin/activate
+        pip install awscli --upgrade
     - name: Project dependencies setup, node version ${{ inputs.node-version }}
       shell: bash
       run: yarn install --frozen-lockfile

diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml
@@ -6,7 +6,7 @@ on:
     types: [opened, closed, synchronize]
 
 jobs:
-  CLAssistant:
+  CLAAssistant:
     runs-on: ubuntu-latest
     steps:
       - name: 'CLA Assistant'
@@ -19,11 +19,11 @@ jobs:
           PERSONAL_ACCESS_TOKEN: ${{ secrets.CLA_ACCESS_TOKEN }}
         with:
           path-to-signatures: 'signatures/version1/cla.json'
-          path-to-document: 'https://safe.global/cla/' # e.g. a CLA or a DCO document
+          path-to-document: 'https://safe.global/cla' # e.g. a CLA or a DCO document
           # branch should not be protected
           branch: 'main'
           # user names of users allowed to contribute without CLA
-          allowlist: mikhailxyz,rmeissner,germartinez,Uxio0,dasanra,francovenica,luarx,DaniSomoza,yagopv,JagoFigueroa,bot*
+          allowlist: clovisdasilvaneto,rmeissner,Uxio0,dasanra,francovenica,luarx,yagopv,usame-algan,bot*
 
           # the followings are the optional inputs - If the optional inputs are not given, then default values will be taken
           # enter the remote organization name where the signatures should be stored (Default is storing the signatures in the same repository)

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
@@ -32,7 +32,7 @@ jobs:
           aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
 
       - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v2
+        uses: nrwl/nx-set-shas@v4
 
       - name: Test, Build, Deploy PR
         run: |
@@ -48,6 +48,7 @@ jobs:
           REACT_APP_MMI_BACKEND_BASE_URL: ${{ secrets.MMI_BACKEND_BASE_URL }}
           REACT_APP_MMI_ENVIRONMENT: ${{ secrets.MMI_ENVIRONMENT }}
           REACT_APP_WALLETCONNECT_PROJECT_ID: ${{ secrets.REACT_APP_WALLETCONNECT_PROJECT_ID_DEVSTAGING }}
+          REACT_APP_RAMP_APIKEY: ${{ secrets.REACT_APP_RAMP_APIKEY }}
 
       - name: 'PRaul: Comment PR with app URLs'
         if: success() && github.event.number
@@ -57,7 +58,6 @@ jobs:
             * [Drain Account App](${{ env.REVIEW_FEATURE_URL }}/drain-safe/)
             * [RAMP Network App](${{ env.REVIEW_FEATURE_URL }}/ramp-network/)
             * [Sign-In With Ethereum Delegate Manager App](${{ env.REVIEW_FEATURE_URL }}/siwe-delegate-manager/)
-            * [Safe Claiming App](${{ env.REVIEW_FEATURE_URL }}/safe-claiming-app/)
             * [Tx Builder App](${{ env.REVIEW_FEATURE_URL }}/tx-builder/)
             * [WalletConnect app](${{ env.REVIEW_FEATURE_URL }}/wallet-connect/)
             * [MMI App](${{ env.REVIEW_FEATURE_URL }}/mmi/)
@@ -83,7 +83,7 @@ jobs:
           aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
 
       - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v2
+        uses: nrwl/nx-set-shas@v4
 
       - name: Test and Build
         run: |
@@ -96,6 +96,7 @@ jobs:
           REACT_APP_MMI_BACKEND_BASE_URL: ${{ secrets.MMI_BACKEND_BASE_URL }}
           REACT_APP_MMI_ENVIRONMENT: ${{ secrets.MMI_ENVIRONMENT }}
           REACT_APP_WALLETCONNECT_PROJECT_ID: ${{ secrets.REACT_APP_WALLETCONNECT_PROJECT_ID_DEVSTAGING }}
+          REACT_APP_RAMP_APIKEY: ${{ secrets.REACT_APP_RAMP_APIKEY }}
 
       # Script to deploy to the dev environment
       - name: 'Deploy to S3: Develop'
@@ -141,3 +142,4 @@ jobs:
           react-app-mmi-backend-base-url: ${{ secrets.MMI_BACKEND_BASE_URL }}
           react-app-mmi-environment: ${{ secrets.MMI_ENVIRONMENT }}
           react-app-walletconnect-project-id: ${{ secrets.REACT_APP_WALLETCONNECT_PROJECT_ID }}
+          react-app-ramp-api: ${{ secrets.REACT_APP_RAMP_APIKEY }}
diff --git a/.github/workflows/safe-apps-check.yml b/.github/workflows/safe-apps-check.yml
@@ -22,9 +22,9 @@ on:
         description: 'Config service base URL'
         required: true
         default: 'https://safe-client.safe.global'
-  schedule:
-    # At 9:00 on every day-of-week from Monday through Friday
-    - cron: '0 9 * * 1-5'
+  # schedule:
+  #   # At 4:00 on every day-of-week from Monday through Friday
+  #   - cron: '0 4 * * 1-5'
 
 jobs:
   e2e:
@@ -177,21 +177,3 @@ jobs:
           SLACK_WEBHOOK_URL: ${{  secrets.SLACK_WEBHOOK_URL }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         continue-on-error: true
-
-      - uses: cypress-io/github-action@v5
-        name: Volta
-        with:
-          browser: chrome
-          record: true
-          spec: cypress/e2e/safe-apps-check.spec.cy.js
-        env:
-          CI: 'true'
-          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
-          CYPRESS_WEB_BASE_URL: ${{ github.event.inputs.baseUrl || 'https://app.safe.global' }}
-          CYPRESS_CHAIN_ID: ${{ github.event.inputs.chainId || '73799' }}
-          CYPRESS_NETWORK_PREFIX: ${{ github.event.inputs.networkPrefix || 'vt' }}
-          CYPRESS_TESTING_SAFE_ADDRESS: ${{ github.event.inputs.safeAddress || '0x6eaD891f8a756edBf248A5546ff51E01609C0DaB' }}
-          CYPRESS_CLIENT_GATEWAY_BASE_URL: ${{ github.event.inputs.configServiceBaseUrl || 'https://safe-client.safe.global' }}
-          SLACK_WEBHOOK_URL: ${{  secrets.SLACK_WEBHOOK_URL }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        continue-on-error: true
diff --git a/.github/workflows/safe-apps-e2e.yml b/.github/workflows/safe-apps-e2e.yml
@@ -52,19 +52,16 @@ jobs:
       - name: Set PR Safe Apps base URL
         run: |
           echo "SAFE_APPS_BASE_URL=https://pr${{ github.event.number }}--safereactapps.review-react-hr.5afe.dev" >> $GITHUB_ENV
-          echo "BASE_URL=https://safe-web.dev.5afe.dev/app" >> $GITHUB_ENV
         if: github.ref != 'refs/heads/development'
 
       - name: Set development Safe Apps base URL
         run: |
           echo "SAFE_APPS_BASE_URL=https://safe-apps.dev.5afe.dev" >> $GITHUB_ENV
-          echo "BASE_URL=https://safe-web.dev.5afe.dev/app" >> $GITHUB_ENV
         if: github.ref == 'refs/heads/development'
 
       - name: Set main Safe Apps base URL
         run: |
-          echo "SAFE_APPS_BASE_URL=https://apps.gnosis-safe.io" >> $GITHUB_ENV
-          echo "BASE_URL=https://gnosis-safe.io/app" >> $GITHUB_ENV
+          echo "SAFE_APPS_BASE_URL=https://apps-portal.safe.global" >> $GITHUB_ENV
         if: ${{ github.ref == 'refs/heads/main' || github.event.schedule == '0 9 * * 1-5' }}
 
       - name: Checkout safe-react-apps

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-16
+18
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Safe Apps
 
-[![Logo](https://raw.githubusercontent.com/safe-global/safe-react-apps/main/assets/logo.png)](https://safe.global/)
+[![Logo](https://raw.githubusercontent.com/safe-global/safe-react-apps/main/assets/logo.svg)](https://safe.global/)
 
 ![license](https://img.shields.io/github/license/safe-global/safe-react-apps)
 ![build](https://img.shields.io/github/actions/workflow/status/safe-global/safe-react-apps/deployment.yml?branch=main)
@@ -62,11 +62,11 @@ In `./apps` you can find one folder per each integration app Gnosis develops.
 
 Also, each app must expose a `manifest.json` in order to be accepted by the Safe, you can find it in their `./public` folder. Besides the `manifest.json` file we also include the app Icon.
 
-This will allow the Safe to consume these resources like so: `https://apps.gnosis-safe.io/tx-builder/manifest.json`
+This will allow the Safe to consume these resources like so: `https://apps-portal.safe.global/tx-builder/manifest.json`
 
 ## How to Develop a third-party App
 
-Documentation about how to develop and integrate your third-party app can be found [here](https://docs.gnosis-safe.io/build/sdks/safe-apps).
+Documentation about how to develop and integrate your third-party app can be found [here](https://docs.safe.global/safe-core-aa-sdk/safe-apps).
 
 ## For developers
 
@@ -98,12 +98,12 @@ These apps are deployed in the following environments.
   | [Transaction Builder](https://safe-apps.staging.5afe.dev/tx-builder)
   | [WalletConnect](https://safe-apps.staging.5afe.dev/wallet-connect)
 
-- When the code is released: https://apps.gnosis-safe.io
+- When the code is released: https://apps-portal.safe.global
 
-  [Drain Account](https://apps.gnosis-safe.io/drain-safe)
-  | [Ramp Network](https://apps.gnosis-safe.io/ramp-network)
-  | [Transaction Builder](https://apps.gnosis-safe.io/tx-builder)
-  | [WalletConnect](https://apps.gnosis-safe.io/wallet-connect)
+  [Drain Account](https://apps-portal.safe.global/drain-safe)
+  | [Ramp Network](https://apps-portal.safe.global/ramp-network)
+  | [Transaction Builder](https://apps-portal.safe.global/tx-builder)
+  | [WalletConnect](https://apps-portal.safe.global/wallet-connect)
 
 ## Run e2e tests
 

diff --git a/apps/drain-safe/CHANGELOG.md b/apps/drain-safe/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+## [1.5.1](https://github.com/safe-global/safe-react-apps/compare/drain-safe-1.5.0...drain-safe-1.5.1) (2023-08-23)
+
+
+
+# [1.5.0](https://github.com/safe-global/safe-react-apps/compare/drain-safe-1.4.0...drain-safe-1.5.0) (2023-05-11)
+
+
+### Features
+
+* **wallet-connect:** update safe-apps-sdk to enable synchronous off-chain signatures ([#657](https://github.com/safe-global/safe-react-apps/issues/657)) ([6b1562f](https://github.com/safe-global/safe-react-apps/commit/6b1562f59eeaff662c212ee0b71f7df602cf0185))
+
+
+
 # [1.4.0](https://github.com/safe-global/safe-react-apps/compare/drain-safe-1.3.6...drain-safe-1.4.0) (2023-02-27)
 
 

diff --git a/apps/drain-safe/package.json b/apps/drain-safe/package.json
@@ -1,13 +1,13 @@
 {
   "name": "drain-safe",
-  "version": "1.4.0",
+  "version": "1.5.1",
   "private": true,
   "dependencies": {
     "@gnosis.pm/safe-react-components": "^1.2.0",
     "@material-ui/core": "^4.12.4",
     "@mui/x-data-grid": "4.0.2",
-    "@safe-global/safe-apps-provider": "^0.16.0",
-    "bignumber.js": "^9.1.0",
+    "@safe-global/safe-apps-provider": "^0.18.0",
+    "bignumber.js": "^9.1.1",
     "web3-eth-abi": "~1.8.1"
   },
   "scripts": {

diff --git a/apps/drain-safe/src/__tests__/sdk-helpers.test.js b/apps/drain-safe/src/__tests__/sdk-helpers.test.js
@@ -1,6 +1,14 @@
 import { encodeTxData, tokenToTx } from '../utils/sdk-helpers'
 import erc20 from '../abis/erc20'
 
+// Axios is bundled as ESM module which is not directly compatible with Jest
+// https://jestjs.io/docs/ecmascript-modules
+jest.mock('axios', () => ({
+  get: jest.fn(),
+  post: jest.fn(),
+  delete: jest.fn(),
+}))
+
 describe('Safe SDK helpers', () => {
   describe('encodeTxData', () => {
     it('encodes a simple transfer call', () => {

diff --git a/apps/drain-safe/src/setupTests.ts b/apps/drain-safe/src/setupTests.ts
@@ -1 +1,8 @@
 import '@testing-library/jest-dom/extend-expect'
+
+// Jest is not able to use this function from node, which is used at viem v1.3.0
+// We need to import it manually
+import { TextEncoder } from 'util'
+
+global.TextEncoder = TextEncoder
+// END
diff --git a/apps/ramp-network/.env.example b/apps/ramp-network/.env.example
@@ -0,0 +1 @@
+REACT_APP_RAMP_APIKEY=
diff --git a/apps/ramp-network/CHANGELOG.md b/apps/ramp-network/CHANGELOG.md
@@ -2,6 +2,42 @@
 
 This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
 
+# [0.3.0](https://github.com/safe-global/safe-react-apps/compare/ramp-network-0.2.0...ramp-network-0.3.0) (2024-08-20)
+
+
+### Features
+
+* **ramp:** add Optimism and Linea ([#814](https://github.com/safe-global/safe-react-apps/issues/814)) ([3e63b26](https://github.com/safe-global/safe-react-apps/commit/3e63b26ca9eb9844cfc0de942ef88d5c132202da))
+
+
+
+# [0.2.0](https://github.com/safe-global/safe-react-apps/compare/ramp-network-0.1.4...ramp-network-0.2.0) (2024-01-25)
+
+
+### Bug Fixes
+
+* **ramp-network:** upgrade SDK to 4.0.4 ([#778](https://github.com/safe-global/safe-react-apps/issues/778)) ([87fd5eb](https://github.com/safe-global/safe-react-apps/commit/87fd5eb1c277d87fec8c3b8f5b157f44b2e7ec82))
+
+
+### Features
+
+* add support for additional chains on ramp ([#786](https://github.com/safe-global/safe-react-apps/issues/786)) ([da6ed53](https://github.com/safe-global/safe-react-apps/commit/da6ed53acb2e4a961d9735474ca85d259aab38c4))
+
+
+
+## [0.1.5](https://github.com/safe-global/safe-react-apps/compare/ramp-network-0.1.4...ramp-network-0.1.5) (2023-11-29)
+
+
+### Bug Fixes
+
+* **ramp-network:** upgrade SDK to 4.0.4 ([#778](https://github.com/safe-global/safe-react-apps/issues/778)) ([87fd5eb](https://github.com/safe-global/safe-react-apps/commit/87fd5eb1c277d87fec8c3b8f5b157f44b2e7ec82))
+
+
+
+## [0.1.4](https://github.com/safe-global/safe-react-apps/compare/ramp-network-0.1.3...ramp-network-0.1.4) (2023-11-09)
+
+
+
 ## [0.1.3](https://github.com/safe-global/safe-react-apps/compare/ramp-network-0.1.2...ramp-network-0.1.3) (2023-02-06)
 
 

diff --git a/apps/ramp-network/package.json b/apps/ramp-network/package.json
@@ -1,12 +1,12 @@
 {
   "name": "ramp-network",
-  "version": "0.1.3",
+  "version": "0.3.0",
   "private": true,
   "homepage": "./",
   "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
@@ -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/constants.ts b/apps/ramp-network/src/constants.ts
@@ -0,0 +1 @@
+export const RAMP_API_KEY = process.env.REACT_APP_RAMP_APIKEY
diff --git a/apps/ramp-network/src/ramp.ts b/apps/ramp-network/src/ramp.ts
@@ -1,37 +1,37 @@
-import { ChainInfo } from '@safe-global/safe-apps-sdk'
 import { RampInstantEvent, RampInstantSDK } from '@ramp-network/ramp-instant-sdk'
+import { RAMP_API_KEY } from './constants'
 
-const RINKEBY_STAGING_URL = 'https://ri-widget-staging.firebaseapp.com/'
 const WIDGET_CLOSE_EVENT = 'WIDGET_CLOSE'
 const PURCHASE_CREATED_EVENT = 'PURCHASE_CREATED'
 
 export const ASSETS_BY_CHAIN: { [key: string]: string } = {
-  '1': 'ETH_*,ERC20_*',
-  '4': 'ETH_*,ERC20_*',
+  '1': 'ETH_*',
+  '10': 'OPTIMISM_*',
   '56': 'BSC_*',
   '137': 'MATIC_*',
   '100': 'XDAI_*',
   '43114': 'AVAX_*',
-}
-
-export const getRampWidgetUrl = (chainInfo: ChainInfo) => {
-  return chainInfo?.chainId === '4' ? RINKEBY_STAGING_URL : ''
+  '8453': 'BASE_*',
+  '324': 'ZKSYNCERA_*',
+  '1101': 'POLYGONZKEVM_*',
+  '42161': 'ARBITRUM_*',
+  '42220': 'CELO_*',
+  '59144': 'LINEA_*',
 }
 
 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,
     userAddress: address,
+    hostApiKey: RAMP_API_KEY,
   })
     .on('*', (event: RampInstantEvent) => {
       if (event.type === WIDGET_CLOSE_EVENT) {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export const RAMP_API_KEY = process.env.REACT_APP_RAMP_APIKEY