Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: new release #753

Merged
merged 3 commits into from
Aug 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/cla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
types: [opened, closed, synchronize]

jobs:
CLAssistant:
CLAAssistant:
runs-on: ubuntu-latest
steps:
- name: 'CLA Assistant'
Expand All @@ -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: rmeissner,germartinez,Uxio0,dasanra,francovenica,luarx,DaniSomoza,yagopv,JagoFigueroa,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)
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions apps/drain-safe/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"@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.17.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": {
Expand Down
8 changes: 8 additions & 0 deletions apps/drain-safe/src/__tests__/sdk-helpers.test.js
Original file line number Diff line number Diff line change
@@ -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', () => {
Expand Down
7 changes: 7 additions & 0 deletions apps/drain-safe/src/setupTests.ts
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions apps/tx-builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"@material-ui/core": "^4.12.4",
"@material-ui/icons": "^4.11.3",
"@material-ui/lab": "^4.0.0-alpha.60",
"@safe-global/safe-apps-provider": "0.17.0",
"@safe-global/safe-apps-provider": "^0.18.0",
"@safe-global/safe-deployments": "^1.26.0",
"axios": "^0.27.2",
"axios": "^1.4.0",
"evm-proxy-detection": "1.0.0",
"localforage": "^1.10.0",
"react-beautiful-dnd": "^13.1.1",
Expand Down
8 changes: 8 additions & 0 deletions apps/tx-builder/src/components/Header.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@ import { screen, waitFor } from '@testing-library/react'
import { render } from '../test-utils'
import Header from './Header'

// 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('<Header>', () => {
it('Renders Header component', async () => {
render(<Header />)
Expand Down
8 changes: 8 additions & 0 deletions apps/tx-builder/src/components/forms/SolidityForm.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ import SolidityForm, {
TO_ADDRESS_FIELD_NAME,
} from './SolidityForm'

// 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(),
}))

const testAddressMethod = {
inputs: [{ internalType: 'address', name: 'newValue', type: 'address' }],
name: 'testAddressValue',
Expand Down
10 changes: 6 additions & 4 deletions apps/tx-builder/src/lib/simulation/simulation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,16 @@ const TENDERLY_ORG_NAME = process.env.REACT_APP_TENDERLY_ORG_NAME || ''
const NON_SUPPORTED_CHAINS = [
// Energy web chain
'246',
// Base
'8453',
// zkSync Era Testnet
'280',
//zkSync Era Mainnet
'324',
// Polygon zkEVM
'1101',
// Celo
'42220',
// Volta
'73799',
// Base Goerli
'84531',
// Aurora
'1313161554',
]
Expand Down
7 changes: 7 additions & 0 deletions apps/tx-builder/src/setupTests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ import '@testing-library/jest-dom/extend-expect'
import { ChainInfo, SafeInfo } from '@safe-global/safe-apps-sdk'
import { configure } from '@testing-library/react'

// 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

configure({ testIdAttribute: 'id' })

const TEST_SAFE_MOCK: SafeInfo = {
Expand Down
4 changes: 2 additions & 2 deletions apps/wallet-connect/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"homepage": "./",
"dependencies": {
"@gnosis.pm/safe-react-components": "^0.9.7",
"@safe-global/safe-apps-provider": "0.17.0",
"@safe-global/safe-apps-provider": "^0.18.0",
"@safe-global/safe-gateway-typescript-sdk": "^3.7.3",
"@walletconnect/client": "^1.8.0",
"@walletconnect/web3wallet": "^1.8.6",
Expand Down Expand Up @@ -38,6 +38,6 @@
},
"devDependencies": {
"@walletconnect/legacy-types": "^2.0.0",
"@walletconnect/types": "^2.8.0"
"@walletconnect/types": "^2.9.0"
}
}
7 changes: 7 additions & 0 deletions apps/wallet-connect/src/setupTests.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
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

Object.defineProperty(window.navigator, 'mediaDevices', {
writable: true,
value: {
Expand Down
Binary file removed assets/logo.png
Binary file not shown.
21 changes: 21 additions & 0 deletions assets/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
"apps/*"
],
"dependencies": {
"@safe-global/safe-apps-react-sdk": "4.6.6",
"@safe-global/safe-apps-sdk": "7.11.0",
"@safe-global/safe-apps-react-sdk": "^4.7.0",
"@safe-global/safe-apps-sdk": "^8.1.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-scripts": "5.0.1",
Expand All @@ -37,7 +37,7 @@
"@nrwl/tao": "13.8.0",
"@nrwl/workspace": "13.8.0",
"@testing-library/cypress": "^9.0.0",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^12.1.4",
"@testing-library/react-hooks": "^8.0.1",
"@testing-library/user-event": "^14.4.3",
Expand All @@ -49,36 +49,36 @@
"@typescript-eslint/eslint-plugin": "^5.49.0",
"@typescript-eslint/parser": "^5.49.0",
"assert": "^2.0.0",
"axios": "^0.27.2",
"axios": "^1.4.0",
"buffer": "^6.0.3",
"commitizen": "^4.2.5",
"commitizen": "^4.3.0",
"crypto-browserify": "^3.12.0",
"cypress": "^12.4.0",
"cypress-file-upload": "^5.0.8",
"cz-conventional-changelog": "^3.3.0",
"dotenv": "^16.0.3",
"dotenv-cli": "^5.1.0",
"eslint": "^8.32.0",
"eslint-config-prettier": "^8.6.0",
"eslint": "^8.45.0",
"eslint-config-prettier": "^8.8.0",
"eslint-config-react-app": "^7.0.1",
"eslint-plugin-flowtype": "^8.0.3",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.32.1",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-react": "^7.33.0",
"eslint-plugin-react-hooks": "^4.6.0",
"git-cz": "^4.9.0",
"https-browserify": "^1.0.0",
"husky": "~8.0.3",
"lint-staged": "^13.1.0",
"lint-staged": "^13.2.3",
"os-browserify": "^0.3.0",
"prettier": "^2.8.3",
"prettier": "^3.0.0",
"process": "^0.11.10",
"react-app-rewired": "^2.1.6",
"stream-browserify": "^3.0.0",
"stream-http": "^3.2.0",
"typescript": "^4.9.4",
"url": "^0.11.0"
"url": "^0.11.1"
},
"config": {
"commitizen": {
Expand Down
Loading