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.

Sign up for GitHub

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

Jump to bottom

Adapt app for metamask integration extension #5216

Open
wants to merge 40 commits into
base: master
Choose a base branch
from
Open

Adapt app for metamask integration extension #5216

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
831bd80
adapted webpack and added packages
joelamouche May 5, 2021
2d5f9ee
sync with master
joelamouche May 6, 2021
22a7803
add types to api
joelamouche May 6, 2021
72b0f6d
sync with master
joelamouche May 7, 2021
3da5017
lint and remove logs
joelamouche May 10, 2021
870155f
sync with master
joelamouche May 11, 2021
6ca0b6d
updates
joelamouche May 24, 2021
ec7ec25
sync
joelamouche Jun 21, 2021
731f9d7
sync with maaster
joelamouche Jun 22, 2021
100ce6d
sync with master
joelamouche Jul 5, 2021
49dcb67
sync with master
joelamouche Jul 7, 2021
114b178
handle undefined type
joelamouche Jul 8, 2021
9e991e8
sync with master
joelamouche Jul 23, 2021
24e78c3
fix types
joelamouche Jul 26, 2021
2a5e72a
add type to web3aounts call
joelamouche Aug 23, 2021
f74b901
sync with master and update deps
joelamouche Sep 3, 2021
a6cd8dd
re added dependencies
joelamouche Sep 3, 2021
1ef3ddb
sync with master
joelamouche Sep 6, 2021
62ea529
update moonbeam deps, remove consoles, update type
joelamouche Sep 6, 2021
053b2a1
add @types/[email protected]
joelamouche Sep 6, 2021
a22f56f
sync with master
joelamouche Sep 7, 2021
54aca19
update moonbeam-types-bundle
joelamouche Nov 19, 2021
87f54be
Merge remote-tracking branch 'paritytech/master'
joelamouche Nov 19, 2021
e18f1bd
Merge remote-tracking branch 'paritytech/master'
joelamouche Dec 6, 2021
77e34f9
Merge remote-tracking branch 'paritytech/master'
joelamouche Dec 7, 2021
14285f2
Merge remote-tracking branch 'paritytech/master'
joelamouche Dec 13, 2021
affbf9c
Merge remote-tracking branch 'paritytech/master'
joelamouche Dec 15, 2021
e49f10f
Merge remote-tracking branch 'paritytech/master'
joelamouche Dec 16, 2021
7f811f1
Merge remote-tracking branch 'paritytech/master'
joelamouche Dec 17, 2021
82a9c14
Merge remote-tracking branch 'paritytech/master'
joelamouche Dec 20, 2021
64b9eda
Merge remote-tracking branch 'paritytech/master'
joelamouche Dec 27, 2021
21588be
sync with master
joelamouche Dec 27, 2021
d68cd99
resolve conflicts
joelamouche Dec 27, 2021
98def48
comment type force
joelamouche Dec 27, 2021
5367b72
reset yarn lock
joelamouche Dec 27, 2021
a9d20aa
fix deps
joelamouche Dec 27, 2021
cae1b3d
sync with master
joelamouche Jan 26, 2022
c0745f9
add missing url
joelamouche Jan 26, 2022
ebc9883
update deps
joelamouche Jan 26, 2022
0a0ce3c
sync with master
joelamouche Jan 26, 2022
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
13 changes: 3 additions & 10 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,8 @@
"stylelint": "^13.13.1",
"stylelint-config-recommended": "^5.0.0",
"stylelint-config-styled-components": "^0.1.1",
"webpack": "^5.42.0",
"webpack-cli": "^4.7.2"
"webpack": "^5.51.1",
"webpack-cli": "^4.8.0"
},
"dependencies": {
"@metamask/detect-provider": "^1.2.0",
"assert": "^2.0.0",
"https-browserify": "^1.0.0",
"os-browserify": "^0.3.0",
"stream-http": "^3.2.0",
"web3": "^1.3.5"
}
"packageManager": "[email protected]"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that I removed this, I get the errors again, even though the dependency was updated @jacogr

➜  apps git:(jlm-adapt-app-to-metamask-extension) ✗ yarn start
$ polkadot-dev-clean-build 
[webpack-cli] Failed to load '/Users/antoineestienne/GitHubRepo/apps/packages/apps/webpack.serve.cjs' config
[webpack-cli] Error: Cannot find module 'stream-http'

}
14 changes: 7 additions & 7 deletions packages/apps-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
"@phala/typedefs": "0.2.14",
"@polkadot/networks": "^7.3.1",
"@polymathnetwork/polymesh-types": "0.0.2",
"@snowfork/snowbridge-types": "0.2.3",
"@sora-substrate/type-definitions": "1.3.34",
"@subsocial/types": "0.5.9-dev.2",
"@zeitgeistpm/type-defs": "0.2.0",
"moonbeam-types-bundle": "1.1.27",
"pontem-types-bundle": "1.0.5",
"rxjs": "^7.2.0"
"@snowfork/snowbridge-types": "0.2.5",
"@sora-substrate/type-definitions": "1.5.10",
"@subsocial/types": "0.6.1-1",
"@zeitgeistpm/type-defs": "0.2.5",
"moonbeam-types-bundle": "1.2.4",
"pontem-types-bundle": "1.0.14",
"rxjs": "^7.3.0"
},
"devDependencies": {
"i18next": "^19.9.2"
Expand Down
5 changes: 4 additions & 1 deletion packages/page-explorer/src/BlockInfo/ByHash.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,10 @@ function BlockByHash ({ className = '', error, value }: Props): React.ReactEleme
const blockNumber = getHeader?.number.unwrap();
const parentHash = getHeader?.parentHash.toHex();
const hasParent = !getHeader?.parentHash.isEmpty;

console.log('events')
events?.map((e)=>{
console.log(e)
})
return (
<div className={className}>
<Summary
Expand Down
3 changes: 2 additions & 1 deletion packages/page-explorer/src/Events.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ interface Props {

function Events ({ className = '', emptyLabel, eventClassName, events, label }: Props): React.ReactElement<Props> {
const { t } = useTranslation();

console.log('Events comp')
console.log(events)
const header = useMemo(() => [
[label || t<string>('recent events'), 'start']
], [label, t]);
Expand Down
2 changes: 1 addition & 1 deletion packages/react-api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dependencies": {
"@babel/runtime": "^7.15.3",
"@polkadot/api": "^5.7.1",
"@polkadot/extension-dapp": "^0.39.4-6",
"@polkadot/extension-dapp": "^0.39.4-7",
"@substrate/connect": "^0.3.18",
"fflate": "^0.7.1",
"rxjs": "^7.3.0"
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.