Skip to content

Commit

Permalink
Fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@TarikGul
TarikGul committed Nov 4, 2024
2 parents 55d2332 + dde8de4 commit 7842915
Show file tree
Hide file tree
Showing 62 changed files with 416 additions and 273 deletions.
5 changes: 3 additions & 2 deletions CONTRIBUTORS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
24 sxlwar crab config (#6995)
24 WoeOm feat: subscan support fellowship, referenda v2 (#8987)
20 Nikita Update icon and colors for Realis.Network (#6336)
18 Daria Showing waiting, active and inactive nominations on the Accounts page (#10998)
18 fomod-in Update translation.json (#5942)
18 Wei Tang Re-enable Neatcoin endpoint (#8271)
18 William Freudenberger re-activate centrifuge fullnodes (#9377)
17 Daria Relay Chain Coretime UI bugs (#11043)
17 Frank Liu Add Onfinality endpoint for Statemint (#6513)
16 Sam Elamin update to a more stable enpoint behind load balancers (#9897)
16 Stefan Popov Use archive nodes for SORA Kusama and Polkadot parachains (#10215)
Expand Down Expand Up @@ -269,6 +269,7 @@
2 Jay Pan Peaq rpc add (#9547)
2 jimmy-tudeski Update add-accounts.json (#4759)
2 JimYam fix the bug that have no icon for listen in https://polkadot.js.org/apps (#7241)
2 Juan Girini re-add IDN node provider (#11053)
2 Justin Zhou currently unreachable (#8130)
2 kaichao not enable identify for failed set identity txs. (#10747)
2 Krishna Singh Updated Polkadex mainnet and parachain endpoints (#9765)
Expand Down Expand Up @@ -425,7 +426,6 @@
1 Jim Counter Add Subspace Gemini 3h Nova endpoint (#10601)
1 jizer add trustbase infos (#4627)
1 joe petrowski unscrupelous to unscrupulous (#7935)
1 Juan Girini Add Ideal Network testnet to Paseo (#10934)
1 Julien Remove now sunset dotscanner (#9714)
1 Jun Zhang Update translation.json (#4508)
1 Just van Stam Add Polimec Network (#10137)
Expand Down Expand Up @@ -471,6 +471,7 @@
1 motinados fill in all empty values in all languageCaches. (#3606)
1 MOZGIII Add Humanode network endpoint and logo (#8919)
1 Mridul Kumar fix: dropdown options not visible for metadata upgradable extensions (#10264)
1 Mrigesh patni Add watr to paseo (#11057)
1 Nantian update acala rpc (#6704)
1 nasa8x Add GeekCash testnet, logo, color (#5265)
1 NightingaleAsh Add loom network kusama (#5591)
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
},
"sideEffects": false,
"type": "module",
"version": "0.145.2-9-x",
"version": "0.145.2-12-x",
"versions": {
"git": "0.145.2-9-x",
"git": "0.145.2-12-x",
"npm": "0.145.1"
},
"workspaces": [
Expand Down
2 changes: 1 addition & 1 deletion packages/apps-config/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"sideEffects": false,
"type": "module",
"version": "0.145.2-9-x",
"version": "0.145.2-12-x",
"main": "index.js",
"dependencies": {
"@acala-network/type-definitions": "5.1.2",
Expand Down
16 changes: 14 additions & 2 deletions packages/apps-config/src/endpoints/testingRelayPaseo.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import type { EndpointOption } from './types.js';

import { chainsAmplitudeSVG, chainsCoretimeKusamaSVG, chainsFrequencyPaseoSVG, chainsHydrationPaseoSVG, chainsLaosSigmaPNG, chainsMyxcavPNG, chainsPaseoPNG, chainsPeoplePolkadotSVG, chainsPopNetworkSVG } from '@polkadot/apps-config/ui/logos/chains';
import { chainsAmplitudeSVG, chainsCoretimeKusamaSVG, chainsFrequencyPaseoSVG, chainsHydrationPaseoSVG, chainsLaosSigmaPNG, chainsMyxcavPNG, chainsPaseoPNG, chainsPeoplePolkadotSVG, chainsPopNetworkSVG, chainsWatrPNG } from '@polkadot/apps-config/ui/logos/chains';
import { nodesAjunaPNG, nodesAssetHubSVG, nodesAventusSVG, nodesBajunPNG, nodesBifrostSVG, nodesBridgeHubSVG, nodesDarwiniaKoiSVG, nodesHyperbridgePNG, nodesIdealNetworkSVG, nodesIntegriteeSVG, nodesKiltPNG, nodesLitentryPaseoSVG, nodesMandalaPNG, nodesMusePNG, nodesMyriadPaseoSVG, nodesNodleSVG, nodesRegionxPNG, nodesRexSVG, nodesZeitgeistPNG } from '@polkadot/apps-config/ui/logos/nodes';

import { PASEO_GENESIS } from '../api/constants.js';
Expand Down Expand Up @@ -152,7 +152,7 @@ export const testParasPaseo: Omit<EndpointOption, 'teleport'>[] = [
info: 'Ideal Network',
paraId: 4502,
providers: {
// 'IDN Node': 'wss://idn0-testnet.idealabs.network' https://github.com/polkadot-js/apps/issues/10966
'IDN Node': 'wss://idn0-testnet.idealabs.network'
},
text: 'Ideal Network',
ui: {
Expand Down Expand Up @@ -302,6 +302,18 @@ export const testParasPaseo: Omit<EndpointOption, 'teleport'>[] = [
logo: nodesRegionxPNG
}
},
{
info: 'paseoWatr',
paraId: 2058,
providers: {
Watr: 'wss://rpc.dev.watr.org'
},
text: 'Watr Network',
ui: {
color: '#373b39',
logo: chainsWatrPNG
}
},
{
homepage: 'https://xcavate.io/',
info: 'Xcavate',
Expand Down
2 changes: 1 addition & 1 deletion packages/apps-config/src/packageInfo.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

// Do not edit, auto-generated by @polkadot/dev

export const packageInfo = { name: '@polkadot/apps-config', path: 'auto', type: 'auto', version: '0.145.2-9-x' };
export const packageInfo = { name: '@polkadot/apps-config', path: 'auto', type: 'auto', version: '0.145.2-12-x' };
2 changes: 1 addition & 1 deletion packages/apps-electron/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"url": "https://github.com/polkadot-js/apps.git"
},
"sideEffects": false,
"version": "0.145.2-9-x",
"version": "0.145.2-12-x",
"main": "build/electron.js",
"dependencies": {
"electron-log": "^5.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/apps-routing/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"sideEffects": false,
"type": "module",
"version": "0.145.2-9-x",
"version": "0.145.2-12-x",
"peerDependencies": {
"react": "*",
"react-dom": "*",
Expand Down
18 changes: 9 additions & 9 deletions packages/apps/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
},
"sideEffects": true,
"type": "module",
"version": "0.145.2-9-x",
"version": "0.145.2-12-x",
"dependencies": {
"@acala-network/chopsticks-core": "^0.13.3",
"@polkadot/apps-config": "^0.145.2-9-x",
"@polkadot/apps-routing": "^0.145.2-9-x",
"@polkadot/apps-config": "^0.145.2-12-x",
"@polkadot/apps-routing": "^0.145.2-12-x",
"@polkadot/dev": "^0.81.2",
"@polkadot/react-api": "^0.145.2-9-x",
"@polkadot/react-components": "^0.145.2-9-x",
"@polkadot/react-hooks": "^0.145.2-9-x",
"@polkadot/react-params": "^0.145.2-9-x",
"@polkadot/react-query": "^0.145.2-9-x",
"@polkadot/react-signer": "^0.145.2-9-x",
"@polkadot/react-api": "^0.145.2-12-x",
"@polkadot/react-components": "^0.145.2-12-x",
"@polkadot/react-hooks": "^0.145.2-12-x",
"@polkadot/react-params": "^0.145.2-12-x",
"@polkadot/react-query": "^0.145.2-12-x",
"@polkadot/react-signer": "^0.145.2-12-x",
"punycode": "^2.3.1",
"query-string": "^8.1.0",
"react": "^18.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/apps/src/packageInfo.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

// Do not edit, auto-generated by @polkadot/dev

export const packageInfo = { name: '@polkadot/apps', path: 'auto', type: 'auto', version: '0.145.2-9-x' };
export const packageInfo = { name: '@polkadot/apps', path: 'auto', type: 'auto', version: '0.145.2-12-x' };
8 changes: 4 additions & 4 deletions packages/page-accounts/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@
},
"sideEffects": false,
"type": "module",
"version": "0.145.2-9-x",
"version": "0.145.2-12-x",
"dependencies": {
"@polkadot/hw-ledger": "^13.2.2",
"@polkadot/phishing": "^0.24.2",
"@polkadot/react-components": "^0.145.2-9-x",
"@polkadot/react-hooks": "^0.145.2-9-x",
"@polkadot/react-components": "^0.145.2-12-x",
"@polkadot/react-hooks": "^0.145.2-12-x",
"@polkadot/util": "^13.2.2",
"@polkadot/vanitygen": "^0.60.2",
"detect-browser": "^5.3.0",
"file-saver": "^2.0.5"
},
"devDependencies": {
"@polkadot/test-support": "0.145.2-9-x"
"@polkadot/test-support": "0.145.2-12-x"
},
"peerDependencies": {
"react": "*",
Expand Down
4 changes: 2 additions & 2 deletions packages/page-addresses/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
},
"sideEffects": false,
"type": "module",
"version": "0.145.2-9-x",
"version": "0.145.2-12-x",
"dependencies": {
"@polkadot/react-components": "^0.145.2-9-x",
"@polkadot/react-components": "^0.145.2-12-x",
"file-saver": "^2.0.5"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/page-alliance/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"sideEffects": false,
"type": "module",
"version": "0.145.2-9-x",
"version": "0.145.2-12-x",
"peerDependencies": {
"react": "*",
"react-dom": "*",
Expand Down
2 changes: 1 addition & 1 deletion packages/page-ambassador/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"sideEffects": false,
"type": "module",
"version": "0.145.2-9-x",
"version": "0.145.2-12-x",
"peerDependencies": {
"react": "*",
"react-dom": "*",
Expand Down
4 changes: 2 additions & 2 deletions packages/page-assets/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
},
"sideEffects": false,
"type": "module",
"version": "0.145.2-9-x",
"version": "0.145.2-12-x",
"dependencies": {
"@polkadot/react-components": "^0.145.2-9-x"
"@polkadot/react-components": "^0.145.2-12-x"
},
"peerDependencies": {
"react": "*",
Expand Down
6 changes: 3 additions & 3 deletions packages/page-bounties/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
},
"sideEffects": false,
"type": "module",
"version": "0.145.2-9-x",
"version": "0.145.2-12-x",
"dependencies": {
"@polkadot/react-components": "^0.145.2-9-x"
"@polkadot/react-components": "^0.145.2-12-x"
},
"devDependencies": {
"@polkadot/test-support": "0.145.2-9-x"
"@polkadot/test-support": "0.145.2-12-x"
},
"peerDependencies": {
"react": "*",
Expand Down
6 changes: 3 additions & 3 deletions packages/page-broker/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
},
"sideEffects": false,
"type": "module",
"version": "0.145.2-9-x",
"version": "0.145.2-12-x",
"dependencies": {
"@polkadot/react-components": "0.145.2-9-x",
"@polkadot/react-query": "0.145.2-9-x"
"@polkadot/react-components": "0.145.2-12-x",
"@polkadot/react-query": "0.145.2-12-x"
},
"peerDependencies": {
"react": "*",
Expand Down
4 changes: 2 additions & 2 deletions packages/page-calendar/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
},
"sideEffects": false,
"type": "module",
"version": "0.145.2-9-x",
"version": "0.145.2-12-x",
"dependencies": {
"@polkadot/react-components": "^0.145.2-9-x"
"@polkadot/react-components": "^0.145.2-12-x"
},
"peerDependencies": {
"react": "*",
Expand Down
4 changes: 2 additions & 2 deletions packages/page-claims/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
},
"sideEffects": false,
"type": "module",
"version": "0.145.2-9-x",
"version": "0.145.2-12-x",
"dependencies": {
"@polkadot/react-components": "^0.145.2-9-x",
"@polkadot/react-components": "^0.145.2-12-x",
"secp256k1": "^3.8.0"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/page-collator/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"sideEffects": false,
"type": "module",
"version": "0.145.2-9-x",
"version": "0.145.2-12-x",
"peerDependencies": {
"react": "*",
"react-dom": "*",
Expand Down
2 changes: 1 addition & 1 deletion packages/page-contracts/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"sideEffects": false,
"type": "module",
"version": "0.145.2-9-x",
"version": "0.145.2-12-x",
"dependencies": {
"@polkadot/api-contract": "14.2.1",
"eventemitter3": "^5.0.1"
Expand Down
6 changes: 3 additions & 3 deletions packages/page-coretime/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
},
"sideEffects": false,
"type": "module",
"version": "0.145.2-9-x",
"version": "0.145.2-12-x",
"dependencies": {
"@polkadot/react-components": "^0.145.2-9-x",
"@polkadot/react-query": "^0.145.2-9-x"
"@polkadot/react-components": "^0.145.2-12-x",
"@polkadot/react-query": "^0.145.2-12-x"
},
"peerDependencies": {
"react": "*",
Expand Down
6 changes: 3 additions & 3 deletions packages/page-council/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
},
"sideEffects": false,
"type": "module",
"version": "0.145.2-9-x",
"version": "0.145.2-12-x",
"dependencies": {
"@polkadot/react-components": "^0.145.2-9-x",
"@polkadot/react-query": "^0.145.2-9-x"
"@polkadot/react-components": "^0.145.2-12-x",
"@polkadot/react-query": "^0.145.2-12-x"
},
"peerDependencies": {
"react": "*",
Expand Down
6 changes: 3 additions & 3 deletions packages/page-democracy/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
},
"sideEffects": false,
"type": "module",
"version": "0.145.2-9-x",
"version": "0.145.2-12-x",
"dependencies": {
"@polkadot/react-components": "^0.145.2-9-x",
"@polkadot/react-query": "^0.145.2-9-x"
"@polkadot/react-components": "^0.145.2-12-x",
"@polkadot/react-query": "^0.145.2-12-x"
},
"peerDependencies": {
"react": "*",
Expand Down
4 changes: 2 additions & 2 deletions packages/page-explorer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
},
"sideEffects": false,
"type": "module",
"version": "0.145.2-9-x",
"version": "0.145.2-12-x",
"dependencies": {
"@polkadot/react-components": "^0.145.2-9-x"
"@polkadot/react-components": "^0.145.2-12-x"
},
"peerDependencies": {
"react": "*",
Expand Down
8 changes: 4 additions & 4 deletions packages/page-extrinsics/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
},
"sideEffects": false,
"type": "module",
"version": "0.145.2-9-x",
"version": "0.145.2-12-x",
"dependencies": {
"@polkadot/react-components": "^0.145.2-9-x",
"@polkadot/react-params": "^0.145.2-9-x",
"@polkadot/react-signer": "^0.145.2-9-x"
"@polkadot/react-components": "^0.145.2-12-x",
"@polkadot/react-params": "^0.145.2-12-x",
"@polkadot/react-signer": "^0.145.2-12-x"
},
"peerDependencies": {
"react": "*",
Expand Down
2 changes: 1 addition & 1 deletion packages/page-fellowship/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"sideEffects": false,
"type": "module",
"version": "0.145.2-9-x",
"version": "0.145.2-12-x",
"peerDependencies": {
"react": "*",
"react-dom": "*",
Expand Down
4 changes: 2 additions & 2 deletions packages/page-files/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
},
"sideEffects": false,
"type": "module",
"version": "0.145.2-9-x",
"version": "0.145.2-12-x",
"dependencies": {
"@polkadot/react-components": "^0.145.2-9-x",
"@polkadot/react-components": "^0.145.2-12-x",
"axios": "^1.6.2"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/page-gilt/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
},
"sideEffects": false,
"type": "module",
"version": "0.145.2-9-x",
"version": "0.145.2-12-x",
"dependencies": {
"@polkadot/react-components": "^0.145.2-9-x"
"@polkadot/react-components": "^0.145.2-12-x"
},
"peerDependencies": {
"react": "*",
Expand Down
Loading

0 comments on commit 7842915

Please sign in to comment.