Skip to content

Commit

Permalink
Merge branch 'main' of github.com:aragon/ods into feat/APP-3051
Browse files Browse the repository at this point in the history
  • Loading branch information
thekidnamedkd committed Apr 16, 2024
2 parents 98123d9 + 25d868f commit 707ecc4
Show file tree
Hide file tree
Showing 5 changed files with 1,417 additions and 1,286 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

### Changed

- Update minor and patch dependencies
- Update `@testing-library/react` to v15
- Adjusted active and hover start styling on `AssetTransfer` module component

## [1.0.22] - 2024-04-12
Expand Down
52 changes: 26 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,16 @@
"@radix-ui/react-switch": "^1.0.0",
"@radix-ui/react-toggle-group": "^1.0.0",
"@radix-ui/react-tooltip": "^1.0.0",
"@tiptap/extension-link": "^2.2.0",
"@tiptap/extension-placeholder": "^2.2.0",
"@tiptap/pm": "^2.2.0",
"@tiptap/react": "^2.2.0",
"@tiptap/starter-kit": "^2.2.0",
"@tiptap/extension-link": "^2.3.0",
"@tiptap/extension-placeholder": "^2.3.0",
"@tiptap/pm": "^2.3.0",
"@tiptap/react": "^2.3.0",
"@tiptap/starter-kit": "^2.3.0",
"blockies-ts": "^1.0.0",
"classnames": "^2.0.0",
"framer-motion": "^11.0.8",
"framer-motion": "^11.0.0",
"react-dropzone": "^14.2.0",
"react-imask": "^7.5.0"
"react-imask": "^7.6.0"
},
"peerDependencies": {
"@tailwindcss/typography": "^0.5.0",
Expand All @@ -73,10 +73,10 @@
"wagmi": "^2.5.0"
},
"devDependencies": {
"@babel/core": "^7.24.0",
"@babel/preset-env": "^7.24.0",
"@babel/preset-react": "^7.23.3",
"@babel/preset-typescript": "^7.23.3",
"@babel/core": "^7.24.4",
"@babel/preset-env": "^7.24.4",
"@babel/preset-react": "^7.24.1",
"@babel/preset-typescript": "^7.24.1",
"@rollup/plugin-commonjs": "^25.0.7",
"@rollup/plugin-image": "^3.0.3",
"@rollup/plugin-node-resolve": "^15.2.3",
Expand All @@ -93,44 +93,44 @@
"@storybook/testing-library": "^0.2.2",
"@svgr/rollup": "^8.1.0",
"@svgr/webpack": "^8.1.0",
"@tailwindcss/typography": "^0.5.10",
"@tanstack/react-query": "^5.24.8",
"@tailwindcss/typography": "^0.5.12",
"@tanstack/react-query": "^5.29.2",
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^14.2.1",
"@testing-library/react": "^15.0.1",
"@testing-library/user-event": "^14.5.2",
"@types/jest": "^29.5.12",
"@typescript-eslint/eslint-plugin": "^7.1.0",
"@typescript-eslint/parser": "^7.1.0",
"autoprefixer": "^10.4.17",
"@typescript-eslint/eslint-plugin": "^7.6.0",
"@typescript-eslint/parser": "^7.6.0",
"autoprefixer": "^10.4.19",
"cross-env": "^7.0.3",
"eslint": "^8.57.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react": "^7.34.1",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-storybook": "^0.8.0",
"eslint-plugin-tailwindcss": "^3.14.3",
"eslint-plugin-tailwindcss": "^3.15.1",
"eslint-plugin-testing-library": "^6.2.0",
"husky": "^9.0.11",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"lint-staged": "^15.2.2",
"postcss": "^8.4.35",
"postcss": "^8.4.38",
"prettier": "^3.2.5",
"prettier-plugin-organize-imports": "^3.2.4",
"prettier-plugin-tailwindcss": "^0.5.11",
"prettier-plugin-tailwindcss": "^0.5.13",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"rollup": "^4.12.0",
"rollup": "^4.14.2",
"rollup-plugin-peer-deps-external": "^2.2.4",
"rollup-plugin-postcss": "^4.0.2",
"rollup-plugin-visualizer": "^5.12.0",
"storybook": "^7.6.17",
"tailwindcss": "^3.4.1",
"tailwindcss": "^3.4.3",
"ts-jest": "^29.1.2",
"typescript": "^5.3.3",
"viem": "^2.7.19",
"wagmi": "^2.5.7"
"typescript": "^5.4.5",
"viem": "^2.9.16",
"wagmi": "^2.5.19"
},
"bugs": {
"url": "https://github.com/aragon/ods/issues"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { TransactionDataListItemStructure as Structure } from './transactionDataListItemStructure/transactionDataListItemStructure';
import { TransactionDataListItemStructure as Structure } from './transactionDataListItemStructure';

export const TransactionDataListItem = {
Structure,
};

export {
ITransactionDataListItemProps,
TransactionStatus,
TransactionType,
} from './transactionDataListItemStructure/transactionDataListItemStructure.api';
type ITransactionDataListItemProps,
} from './transactionDataListItemStructure';
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export { TransactionDataListItemStructure } from './transactionDataListItemStructure';
export {
ITransactionDataListItemProps,
TransactionStatus,
TransactionType,
type ITransactionDataListItemProps,
} from './transactionDataListItemStructure.api';
Loading

0 comments on commit 707ecc4

Please sign in to comment.