Rename ui-* -> react-* (#1495)

* Rename ui-* -> react-*

* Rename actual folders

* react-app -> react-components

* CSS links

packages/app-123code/package.json

@@ -11,6 +11,6 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime": "^7.5.5",
-    "@polkadot/ui-app": "^0.34.0-beta.119"
+    "@polkadot/react-components": "^0.34.0-beta.119"
   }
 }

packages/app-123code/src/AccountSelector.tsx

@@ -4,8 +4,8 @@
 
 import React from 'react';
 import styled from 'styled-components';
-import { Bubble, InputAddress } from '@polkadot/ui-app';
-import { AccountIndex, Balance, Nonce } from '@polkadot/ui-reactive';
+import { Bubble, InputAddress } from '@polkadot/react-components';
+import { AccountIndex, Balance, Nonce } from '@polkadot/react-query';
 
 interface Props {
   className?: string;

packages/app-123code/src/Summary.tsx

@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { BareProps } from '@polkadot/ui-app/types';
+import { BareProps } from '@polkadot/react-components/types';
 
 import React from 'react';
 import styled from 'styled-components';

packages/app-123code/src/SummaryBar.tsx

@@ -4,13 +4,13 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { AccountId, RuntimeVersion } from '@polkadot/types/interfaces';
-import { ApiProps } from '@polkadot/ui-api/types';
-import { BareProps, I18nProps } from '@polkadot/ui-app/types';
+import { ApiProps } from '@polkadot/react-api/types';
+import { BareProps, I18nProps } from '@polkadot/react-components/types';
 
 import BN from 'bn.js';
 import React from 'react';
-import { withCalls } from '@polkadot/ui-api/with';
-import { Bubble, IdentityIcon } from '@polkadot/ui-app';
+import { withCalls } from '@polkadot/react-api/with';
+import { Bubble, IdentityIcon } from '@polkadot/react-components';
 import { formatBalance, formatNumber } from '@polkadot/util';
 
 import translate from './translate';

packages/app-123code/src/Transfer.tsx

@@ -4,7 +4,7 @@
 
 import BN from 'bn.js';
 import React from 'react';
-import { Button, InputAddress, InputBalance, TxButton, TxComponent } from '@polkadot/ui-app';
+import { Button, InputAddress, InputBalance, TxButton, TxComponent } from '@polkadot/react-components';
 
 import Summary from './Summary';
 

packages/app-123code/src/index.tsx

@@ -6,7 +6,7 @@
 // translatable strings. Generally the latter is quite "light",
 // `t` is inject into props (see the HOC export) and `t('any text')
 // does the translation
-import { AppProps, I18nProps } from '@polkadot/ui-app/types';
+import { AppProps, I18nProps } from '@polkadot/react-components/types';
 
 // external imports (including those found in the packages/*
 // of this repo)

packages/app-accounts/package.json

@@ -11,7 +11,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime": "^7.5.5",
-    "@polkadot/ui-app": "^0.34.0-beta.119",
+    "@polkadot/react-components": "^0.34.0-beta.119",
     "@types/file-saver": "^2.0.0",
     "@types/yargs": "^13.0.2",
     "babel-plugin-module-resolver": "^3.1.1",

packages/app-accounts/src/Account.tsx

@@ -2,11 +2,11 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { ActionStatus } from '@polkadot/ui-app/Status/types';
-import { I18nProps } from '@polkadot/ui-app/types';
+import { ActionStatus } from '@polkadot/react-components/Status/types';
+import { I18nProps } from '@polkadot/react-components/types';
 
 import React from 'react';
-import { AddressCard, AddressInfo, Button, Forget, Icon } from '@polkadot/ui-app';
+import { AddressCard, AddressInfo, Button, Forget, Icon } from '@polkadot/react-components';
 import keyring from '@polkadot/ui-keyring';
 
 import Backup from './modals/Backup';

packages/app-accounts/src/Banner.tsx

@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 
 import { detect } from 'detect-browser';
 import React from 'react';

packages/app-accounts/src/Overview.tsx

@@ -2,14 +2,14 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 import { SubjectInfo } from '@polkadot/ui-keyring/observable/types';
 import { ComponentProps } from './types';
 
 import React from 'react';
 import accountObservable from '@polkadot/ui-keyring/observable/accounts';
-import { withMulti, withObservable } from '@polkadot/ui-api';
-import { Button, CardGrid } from '@polkadot/ui-app';
+import { withMulti, withObservable } from '@polkadot/react-api';
+import { Button, CardGrid } from '@polkadot/react-components';
 
 import CreateModal from './modals/Create';
 import ImportModal from './modals/Import';

packages/app-accounts/src/Vanity/Match.tsx

@@ -2,11 +2,11 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { BareProps } from '@polkadot/ui-app/types';
+import { BareProps } from '@polkadot/react-components/types';
 
 import React from 'react';
 import styled from 'styled-components';
-import { Button, IdentityIcon } from '@polkadot/ui-app';
+import { Button, IdentityIcon } from '@polkadot/react-components';
 import { u8aToHex } from '@polkadot/util';
 
 interface Props extends BareProps {

packages/app-accounts/src/Vanity/index.tsx

@@ -2,14 +2,14 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 import { KeypairType } from '@polkadot/util-crypto/types';
 import { GeneratorMatches, GeneratorMatch, GeneratorResult } from '../vanitygen/types';
 import { ComponentProps } from '../types';
 
 import React from 'react';
 import styled from 'styled-components';
-import { Button, Dropdown, Input, TxComponent } from '@polkadot/ui-app';
+import { Button, Dropdown, Input, TxComponent } from '@polkadot/react-components';
 import uiSettings from '@polkadot/ui-settings';
 
 import CreateModal from '../modals/Create';

packages/app-accounts/src/index.tsx

@@ -2,16 +2,16 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { AppProps, I18nProps } from '@polkadot/ui-app/types';
+import { AppProps, I18nProps } from '@polkadot/react-components/types';
 import { ComponentProps, LocationProps } from './types';
 import { SubjectInfo } from '@polkadot/ui-keyring/observable/types';
 
 import React from 'react';
 import { Route, Switch } from 'react-router';
 import accountObservable from '@polkadot/ui-keyring/observable/accounts';
-import { HelpOverlay, Tabs } from '@polkadot/ui-app';
-import { TabItem } from '@polkadot/ui-app/Tabs';
-import { withMulti, withObservable } from '@polkadot/ui-api';
+import { HelpOverlay, Tabs } from '@polkadot/react-components';
+import { TabItem } from '@polkadot/react-components/Tabs';
+import { withMulti, withObservable } from '@polkadot/react-api';
 
 import basicMd from './md/basic.md';
 import Overview from './Overview';

packages/app-accounts/src/modals/Backup.tsx

@@ -2,12 +2,12 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 
 import FileSaver from 'file-saver';
 import React from 'react';
-import { AddressRow, Button, Modal, Password, TxComponent } from '@polkadot/ui-app';
-import { ActionStatus } from '@polkadot/ui-app/Status/types';
+import { AddressRow, Button, Modal, Password, TxComponent } from '@polkadot/react-components';
+import { ActionStatus } from '@polkadot/react-components/Status/types';
 import keyring from '@polkadot/ui-keyring';
 
 import translate from '../translate';

packages/app-accounts/src/modals/ChangePass.tsx

@@ -2,11 +2,11 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 
 import React from 'react';
-import { AddressRow, Button, Modal, Password, TxComponent } from '@polkadot/ui-app';
-import { ActionStatus } from '@polkadot/ui-app/Status/types';
+import { AddressRow, Button, Modal, Password, TxComponent } from '@polkadot/react-components';
+import { ActionStatus } from '@polkadot/react-components/Status/types';
 import keyring from '@polkadot/ui-keyring';
 
 import translate from '../translate';

packages/app-accounts/src/modals/Create.tsx

@@ -2,9 +2,9 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { I18nProps } from '@polkadot/ui-app/types';
-import { ApiProps } from '@polkadot/ui-api/types';
-import { ActionStatus } from '@polkadot/ui-app/Status/types';
+import { I18nProps } from '@polkadot/react-components/types';
+import { ApiProps } from '@polkadot/react-api/types';
+import { ActionStatus } from '@polkadot/react-components/Status/types';
 import { KeypairType } from '@polkadot/util-crypto/types';
 import { ModalProps } from '../types';
 
@@ -12,9 +12,9 @@ import FileSaver from 'file-saver';
 import React from 'react';
 import styled from 'styled-components';
 import { DEV_PHRASE } from '@polkadot/keyring/defaults';
-import { withApi, withMulti } from '@polkadot/ui-api';
-import { AddressRow, Button, Dropdown, Input, Labelled, Modal, Password } from '@polkadot/ui-app';
-import { InputAddress } from '@polkadot/ui-app/InputAddress';
+import { withApi, withMulti } from '@polkadot/react-api';
+import { AddressRow, Button, Dropdown, Input, Labelled, Modal, Password } from '@polkadot/react-components';
+import { InputAddress } from '@polkadot/react-components/InputAddress';
 import keyring from '@polkadot/ui-keyring';
 import uiSettings from '@polkadot/ui-settings';
 import { isHex, u8aToHex } from '@polkadot/util';

packages/app-accounts/src/modals/Import.tsx

@@ -3,13 +3,13 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { KeyringPair$Json } from '@polkadot/keyring/types';
-import { I18nProps } from '@polkadot/ui-app/types';
-import { ActionStatus } from '@polkadot/ui-app/Status/types';
+import { I18nProps } from '@polkadot/react-components/types';
+import { ActionStatus } from '@polkadot/react-components/Status/types';
 import { ModalProps } from '../types';
 
 import React from 'react';
-import { AddressRow, Button, InputFile, Modal, Password, TxComponent } from '@polkadot/ui-app';
-import { InputAddress } from '@polkadot/ui-app/InputAddress';
+import { AddressRow, Button, InputFile, Modal, Password, TxComponent } from '@polkadot/react-components';
+import { InputAddress } from '@polkadot/react-components/InputAddress';
 import { isHex, isObject, u8aToString } from '@polkadot/util';
 import keyring from '@polkadot/ui-keyring';
 

packages/app-accounts/src/modals/Transfer.tsx

@@ -5,18 +5,18 @@
 
 import { SubmittableExtrinsic } from '@polkadot/api/promise/types';
 import { Index } from '@polkadot/types/interfaces';
-import { ApiProps } from '@polkadot/ui-api/types';
+import { ApiProps } from '@polkadot/react-api/types';
 import { DerivedFees } from '@polkadot/api-derive/types';
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 
 import BN from 'bn.js';
 import React from 'react';
 import styled from 'styled-components';
-import { Button, InputAddress, InputBalance, Modal, TxButton } from '@polkadot/ui-app';
-import { Available } from '@polkadot/ui-reactive';
-import Checks, { calcSignatureLength } from '@polkadot/ui-signer/Checks';
-import { withApi, withCalls, withMulti } from '@polkadot/ui-api';
-import { ZERO_FEES } from '@polkadot/ui-signer/Checks/constants';
+import { Button, InputAddress, InputBalance, Modal, TxButton } from '@polkadot/react-components';
+import { Available } from '@polkadot/react-query';
+import Checks, { calcSignatureLength } from '@polkadot/react-signer/Checks';
+import { withApi, withCalls, withMulti } from '@polkadot/react-api';
+import { ZERO_FEES } from '@polkadot/react-signer/Checks/constants';
 
 import translate from '../translate';
 

packages/app-accounts/src/types.ts

@@ -2,8 +2,8 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { AppProps } from '@polkadot/ui-app/types';
-import { ActionStatus } from '@polkadot/ui-app/Status/types';
+import { AppProps } from '@polkadot/react-components/types';
+import { ActionStatus } from '@polkadot/react-components/Status/types';
 
 import { WithTranslation } from 'react-i18next';
 

packages/app-address-book/package.json

@@ -11,6 +11,6 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime": "^7.5.5",
-    "@polkadot/ui-app": "^0.34.0-beta.119"
+    "@polkadot/react-components": "^0.34.0-beta.119"
   }
 }

packages/app-address-book/src/Address.tsx

@@ -3,11 +3,11 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { KeyringAddress } from '@polkadot/ui-keyring/types';
-import { ActionStatus } from '@polkadot/ui-app/Status/types';
-import { I18nProps } from '@polkadot/ui-app/types';
+import { ActionStatus } from '@polkadot/react-components/Status/types';
+import { I18nProps } from '@polkadot/react-components/types';
 
 import React from 'react';
-import { AddressCard, AddressInfo, Button, Forget, Icon } from '@polkadot/ui-app';
+import { AddressCard, AddressInfo, Button, Forget, Icon } from '@polkadot/react-components';
 import keyring from '@polkadot/ui-keyring';
 
 import Transfer from '@polkadot/app-accounts/modals/Transfer';

packages/app-address-book/src/Overview.tsx

@@ -2,14 +2,14 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 import { SubjectInfo } from '@polkadot/ui-keyring/observable/types';
 import { ComponentProps } from './types';
 
 import React from 'react';
-import { Button, CardGrid } from '@polkadot/ui-app';
+import { Button, CardGrid } from '@polkadot/react-components';
 import addressObservable from '@polkadot/ui-keyring/observable/addresses';
-import { withMulti, withObservable } from '@polkadot/ui-api';
+import { withMulti, withObservable } from '@polkadot/react-api';
 
 import CreateModal from './modals/Create';
 import Address from './Address';

packages/app-address-book/src/index.tsx

@@ -2,16 +2,16 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { AppProps, I18nProps } from '@polkadot/ui-app/types';
+import { AppProps, I18nProps } from '@polkadot/react-components/types';
 import { SubjectInfo } from '@polkadot/ui-keyring/observable/types';
 import { ComponentProps } from './types';
 
 import React from 'react';
 import { Route, Switch } from 'react-router';
 import addressObservable from '@polkadot/ui-keyring/observable/addresses';
-import { HelpOverlay } from '@polkadot/ui-app';
-import Tabs, { TabItem } from '@polkadot/ui-app/Tabs';
-import { withMulti, withObservable } from '@polkadot/ui-api';
+import { HelpOverlay } from '@polkadot/react-components';
+import Tabs, { TabItem } from '@polkadot/react-components/Tabs';
+import { withMulti, withObservable } from '@polkadot/react-api';
 
 import basicMd from './md/basic.md';
 import Overview from './Overview';

packages/app-address-book/src/modals/Create.tsx

@@ -2,14 +2,14 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { I18nProps } from '@polkadot/ui-app/types';
-import { ActionStatus } from '@polkadot/ui-app/Status/types';
+import { I18nProps } from '@polkadot/react-components/types';
+import { ActionStatus } from '@polkadot/react-components/Status/types';
 import { ModalProps } from '../types';
 
 import React from 'react';
 
-import { AddressRow, Button, Input, Modal } from '@polkadot/ui-app';
-import { InputAddress } from '@polkadot/ui-app/InputAddress';
+import { AddressRow, Button, Input, Modal } from '@polkadot/react-components';
+import { InputAddress } from '@polkadot/react-components/InputAddress';
 import keyring from '@polkadot/ui-keyring';
 
 import translate from '../translate';

packages/app-address-book/src/types.ts

@@ -2,8 +2,8 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { AppProps } from '@polkadot/ui-app/types';
-import { ActionStatus } from '@polkadot/ui-app/Status/types';
+import { AppProps } from '@polkadot/react-components/types';
+import { ActionStatus } from '@polkadot/react-components/Status/types';
 
 export type ComponentProps = AppProps;
 

packages/app-contracts/package.json

@@ -12,6 +12,6 @@
   "dependencies": {
     "@babel/runtime": "^7.5.5",
     "@polkadot/api-contract": "^0.90.0-beta.43",
-    "@polkadot/ui-app": "^0.34.0-beta.119"
+    "@polkadot/react-components": "^0.34.0-beta.119"
   }
 }

packages/app-contracts/src/ABI.tsx

@@ -2,12 +2,12 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 
 import React from 'react';
 import styled from 'styled-components';
 import { Abi } from '@polkadot/api-contract';
-import { InputFile, Labelled, Messages } from '@polkadot/ui-app';
+import { InputFile, Labelled, Messages } from '@polkadot/react-components';
 import { u8aToString } from '@polkadot/util';
 
 import translate from './translate';

packages/app-contracts/src/Codes/Add.tsx

@@ -4,7 +4,7 @@
 
 import React from 'react';
 import { createType } from '@polkadot/types';
-import { Button, Input } from '@polkadot/ui-app';
+import { Button, Input } from '@polkadot/react-components';
 
 import ContractModal, { ContractModalProps, ContractModalState } from '../Modal';
 import ValidateCode from './ValidateCode';

packages/app-contracts/src/Codes/Code.tsx

@@ -2,15 +2,15 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 import { CodeStored } from '../types';
 
 import React from 'react';
 import styled from 'styled-components';
 import { RouteComponentProps } from 'react-router';
 import { withRouter } from 'react-router-dom';
-import { Button, Card, CodeRow, Forget } from '@polkadot/ui-app';
-import { withMulti } from '@polkadot/ui-api';
+import { Button, Card, CodeRow, Forget } from '@polkadot/react-components';
+import { withMulti } from '@polkadot/react-api';
 
 import ABI from '../ABI';
 import RemoveABI from '../RemoveABI';

packages/app-contracts/src/Codes/Upload.tsx

@@ -3,13 +3,13 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { Hash } from '@polkadot/types/interfaces';
-import { ApiProps } from '@polkadot/ui-api/types';
+import { ApiProps } from '@polkadot/react-api/types';
 import { SubmittableResult } from '@polkadot/api/SubmittableExtrinsic';
 
 import BN from 'bn.js';
 import React from 'react';
-import { withApi, withMulti } from '@polkadot/ui-api';
-import { Button, InputFile, TxButton } from '@polkadot/ui-app';
+import { withApi, withMulti } from '@polkadot/react-api';
+import { Button, InputFile, TxButton } from '@polkadot/react-components';
 import { compactAddLength } from '@polkadot/util';
 
 import ContractModal, { ContractModalProps, ContractModalState } from '../Modal';

packages/app-contracts/src/Codes/ValidateCode.tsx

@@ -4,13 +4,13 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { PrefabWasmModule } from '@polkadot/types/interfaces';
-import { I18nProps } from '@polkadot/ui-app/types';
-import { ApiProps } from '@polkadot/ui-api/types';
+import { I18nProps } from '@polkadot/react-components/types';
+import { ApiProps } from '@polkadot/react-api/types';
 
 import React from 'react';
 import { Option } from '@polkadot/types';
-import { withCalls } from '@polkadot/ui-api';
-import { InfoForInput } from '@polkadot/ui-app';
+import { withCalls } from '@polkadot/react-api';
+import { InfoForInput } from '@polkadot/react-components';
 import { isHex } from '@polkadot/util';
 
 import translate from '../translate';

packages/app-contracts/src/Codes/index.tsx

@@ -2,11 +2,11 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 import { ComponentProps } from '../types';
 
 import React from 'react';
-import { Button, CardGrid } from '@polkadot/ui-app';
+import { Button, CardGrid } from '@polkadot/react-components';
 
 import contracts from '../store';
 import translate from '../translate';

packages/app-contracts/src/Contracts/Add.tsx

@@ -2,13 +2,13 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { ApiProps } from '@polkadot/ui-api/types';
-import { I18nProps } from '@polkadot/ui-app/types';
-import { ActionStatus } from '@polkadot/ui-app/Status/types';
+import { ApiProps } from '@polkadot/react-api/types';
+import { I18nProps } from '@polkadot/react-components/types';
+import { ActionStatus } from '@polkadot/react-components/Status/types';
 
 import React from 'react';
-import { withApi } from '@polkadot/ui-api';
-import { AddressRow, Button, Input } from '@polkadot/ui-app';
+import { withApi } from '@polkadot/react-api';
+import { AddressRow, Button, Input } from '@polkadot/react-components';
 import keyring from '@polkadot/ui-keyring';
 
 import ContractModal, { ContractModalProps, ContractModalState } from '../Modal';

packages/app-contracts/src/Contracts/Call.tsx

@@ -2,16 +2,16 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { ApiProps } from '@polkadot/ui-api/types';
-import { BareProps, I18nProps } from '@polkadot/ui-app/types';
+import { ApiProps } from '@polkadot/react-api/types';
+import { BareProps, I18nProps } from '@polkadot/react-components/types';
 
 import BN from 'bn.js';
 import React from 'react';
 import { withRouter } from 'react-router-dom';
 import { Abi } from '@polkadot/api-contract';
-import { Button, Dropdown, InputAddress, InputBalance, InputNumber, Modal, TxButton, TxComponent } from '@polkadot/ui-app';
-import { getContractAbi } from '@polkadot/ui-app/util';
-import { withApi, withMulti } from '@polkadot/ui-api';
+import { Button, Dropdown, InputAddress, InputBalance, InputNumber, Modal, TxButton, TxComponent } from '@polkadot/react-components';
+import { getContractAbi } from '@polkadot/react-components/util';
+import { withApi, withMulti } from '@polkadot/react-api';
 
 import translate from '../translate';
 import Params from '../Params';

packages/app-contracts/src/Contracts/Contract.tsx

@@ -2,16 +2,16 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { ActionStatus } from '@polkadot/ui-app/Status/types';
-import { I18nProps } from '@polkadot/ui-app/types';
+import { ActionStatus } from '@polkadot/react-components/Status/types';
+import { I18nProps } from '@polkadot/react-components/types';
 
 import React from 'react';
 import { RouteComponentProps } from 'react-router';
 import { withRouter } from 'react-router-dom';
 import keyring from '@polkadot/ui-keyring';
-import { AddressRow, Button, Card, Forget, Messages } from '@polkadot/ui-app';
-import { getContractAbi } from '@polkadot/ui-app/util';
-import { withMulti } from '@polkadot/ui-api';
+import { AddressRow, Button, Card, Forget, Messages } from '@polkadot/react-components';
+import { getContractAbi } from '@polkadot/react-components/util';
+import { withMulti } from '@polkadot/react-api';
 
 import translate from '../translate';
 

packages/app-contracts/src/Contracts/ValidateAddr.tsx

@@ -4,13 +4,13 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { ContractInfo } from '@polkadot/types/interfaces';
-import { I18nProps } from '@polkadot/ui-app/types';
-import { ApiProps } from '@polkadot/ui-api/types';
+import { I18nProps } from '@polkadot/react-components/types';
+import { ApiProps } from '@polkadot/react-api/types';
 
 import React from 'react';
 import { Option } from '@polkadot/types';
-import { withCalls } from '@polkadot/ui-api';
-import { InfoForInput } from '@polkadot/ui-app';
+import { withCalls } from '@polkadot/react-api';
+import { InfoForInput } from '@polkadot/react-components';
 import keyring from '@polkadot/ui-keyring';
 
 import translate from '../translate';

packages/app-contracts/src/Contracts/index.tsx

@@ -2,14 +2,14 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 import { ComponentProps } from '../types';
 
 import React from 'react';
 import { RouteComponentProps } from 'react-router';
 import { withRouter } from 'react-router-dom';
-import { Button, CardGrid } from '@polkadot/ui-app';
-import { withMulti } from '@polkadot/ui-api';
+import { Button, CardGrid } from '@polkadot/react-components';
+import { withMulti } from '@polkadot/react-api';
 
 import translate from '../translate';
 import Add from './Add';

packages/app-contracts/src/Deploy.tsx

@@ -4,20 +4,20 @@
 
 import { AccountId } from '@polkadot/types/interfaces';
 import { TypeDef } from '@polkadot/types/types';
-import { ApiProps } from '@polkadot/ui-api/types';
+import { ApiProps } from '@polkadot/react-api/types';
 import { SubmittableResult } from '@polkadot/api/SubmittableExtrinsic';
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 
 import BN from 'bn.js';
 import React from 'react';
 import { RouteComponentProps } from 'react-router';
 import { withRouter } from 'react-router-dom';
 import { Abi } from '@polkadot/api-contract';
-import { withApi, withMulti } from '@polkadot/ui-api';
+import { withApi, withMulti } from '@polkadot/react-api';
 import keyring from '@polkadot/ui-keyring';
-import { Button, Dropdown, InputBalance, TxButton } from '@polkadot/ui-app';
+import { Button, Dropdown, InputBalance, TxButton } from '@polkadot/react-components';
 import { getTypeDef } from '@polkadot/types';
-import createValues from '@polkadot/ui-params/values';
+import createValues from '@polkadot/react-params/values';
 
 import ContractModal, { ContractModalProps, ContractModalState } from './Modal';
 import Params from './Params';

packages/app-contracts/src/Modal.tsx

@@ -2,12 +2,12 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 
 import BN from 'bn.js';
 import React from 'react';
 import { Abi } from '@polkadot/api-contract';
-import { Button, Input, InputAddress, InputNumber, Modal, TxComponent } from '@polkadot/ui-app';
+import { Button, Input, InputAddress, InputNumber, Modal, TxComponent } from '@polkadot/react-components';
 
 import ABI from './ABI';
 

packages/app-contracts/src/Params.tsx

@@ -4,10 +4,10 @@
 
 import { ContractABIFnArg } from '@polkadot/api-contract/types';
 import { TypeDef } from '@polkadot/types/types';
-import { RawParams } from '@polkadot/ui-params/types';
+import { RawParams } from '@polkadot/react-params/types';
 
 import React from 'react';
-import UIParams from '@polkadot/ui-params';
+import UIParams from '@polkadot/react-params';
 import { getTypeDef } from '@polkadot/types';
 
 interface Props {

packages/app-contracts/src/RemoveABI.tsx

@@ -2,11 +2,11 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 import { CodeStored } from '@polkadot/app-contracts/types';
 
 import React from 'react';
-import { Button, CodeRow, Modal } from '@polkadot/ui-app';
+import { Button, CodeRow, Modal } from '@polkadot/react-components';
 
 import translate from './translate';
 

packages/app-contracts/src/index.tsx

@@ -2,15 +2,15 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { AppProps, I18nProps } from '@polkadot/ui-app/types';
-import { TabItem } from '@polkadot/ui-app/Tabs';
+import { AppProps, I18nProps } from '@polkadot/react-components/types';
+import { TabItem } from '@polkadot/react-components/Tabs';
 import { ComponentProps, LocationProps } from './types';
 
 import React from 'react';
 import { Route, RouteComponentProps, Switch } from 'react-router';
 import { withRouter } from 'react-router-dom';
-import { HelpOverlay, Tabs } from '@polkadot/ui-app';
-import { withMulti, withObservable } from '@polkadot/ui-api';
+import { HelpOverlay, Tabs } from '@polkadot/react-components';
+import { withMulti, withObservable } from '@polkadot/react-api';
 import keyring from '@polkadot/ui-keyring';
 import { SubjectInfo } from '@polkadot/ui-keyring/observable/types';
 

packages/app-contracts/src/store.ts

@@ -9,7 +9,7 @@ import EventEmitter from 'eventemitter3';
 import store from 'store';
 import { Abi } from '@polkadot/api-contract';
 import { createType } from '@polkadot/types';
-import { api } from '@polkadot/ui-api';
+import { api } from '@polkadot/react-api';
 
 const KEY_CODE = 'code:';
 

packages/app-contracts/src/types.ts

@@ -3,7 +3,7 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { Abi } from '@polkadot/api-contract';
-import { AppProps } from '@polkadot/ui-app/types';
+import { AppProps } from '@polkadot/react-components/types';
 import { SubjectInfo } from '@polkadot/ui-keyring/observable/types';
 
 export interface LocationProps {

packages/app-council/package.json

@@ -11,7 +11,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime": "^7.5.5",
-    "@polkadot/ui-app": "^0.34.0-beta.119",
-    "@polkadot/ui-reactive": "^0.34.0-beta.119"
+    "@polkadot/react-components": "^0.34.0-beta.119",
+    "@polkadot/react-query": "^0.34.0-beta.119"
   }
 }

packages/app-council/src/Motions/Motion.tsx

@@ -3,14 +3,14 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { Proposal as ProposalType, Votes } from '@polkadot/types/interfaces';
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 
 import BN from 'bn.js';
 import React from 'react';
 import { Option } from '@polkadot/types';
 
-import { ActionItem, InputAddress, Labelled, Voting } from '@polkadot/ui-app';
-import { withCalls, withMulti } from '@polkadot/ui-api';
+import { ActionItem, InputAddress, Labelled, Voting } from '@polkadot/react-components';
+import { withCalls, withMulti } from '@polkadot/react-api';
 
 import translate from '../translate';
 

packages/app-council/src/Motions/Propose.tsx

@@ -3,14 +3,14 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { Call, Proposal } from '@polkadot/types/interfaces';
-import { ApiProps } from '@polkadot/ui-api/types';
+import { ApiProps } from '@polkadot/react-api/types';
 
 import BN from 'bn.js';
 import React from 'react';
 import { createType } from '@polkadot/types';
-import { Button, Extrinsic, InputNumber } from '@polkadot/ui-app';
-import TxModal, { TxModalState, TxModalProps } from '@polkadot/ui-app/TxModal';
-import { withApi, withCalls, withMulti } from '@polkadot/ui-api';
+import { Button, Extrinsic, InputNumber } from '@polkadot/react-components';
+import TxModal, { TxModalState, TxModalProps } from '@polkadot/react-components/TxModal';
+import { withApi, withCalls, withMulti } from '@polkadot/react-api';
 
 import translate from '../translate';
 

packages/app-council/src/Motions/index.tsx

@@ -4,11 +4,11 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { Hash } from '@polkadot/types/interfaces';
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 
 import React from 'react';
-import { withCalls } from '@polkadot/ui-api';
-import { CardGrid } from '@polkadot/ui-app';
+import { withCalls } from '@polkadot/react-api';
+import { CardGrid } from '@polkadot/react-components';
 
 import Motion from './Motion';
 import Propose from './Propose';

packages/app-council/src/Overview/Candidate.tsx

@@ -5,7 +5,7 @@
 import { AccountId } from '@polkadot/types/interfaces';
 
 import React from 'react';
-import { AddressCard } from '@polkadot/ui-app';
+import { AddressCard } from '@polkadot/react-components';
 
 interface Props {
   address: AccountId;

packages/app-council/src/Overview/Member.tsx

@@ -3,10 +3,10 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { BlockNumber } from '@polkadot/types/interfaces';
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 
 import React from 'react';
-import { AddressCard } from '@polkadot/ui-app';
+import { AddressCard } from '@polkadot/react-components';
 import { formatNumber } from '@polkadot/util';
 
 import translate from '../translate';

packages/app-council/src/Overview/Members.tsx

@@ -3,11 +3,11 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 import { ComponentProps } from './types';
 
 import React from 'react';
-import { Columar, Column } from '@polkadot/ui-app';
+import { Columar, Column } from '@polkadot/react-components';
 
 import translate from '../translate';
 import Candidate from './Candidate';

packages/app-council/src/Overview/SubmitCandidacy.tsx

@@ -6,8 +6,8 @@ import { ComponentProps } from './types';
 
 import BN from 'bn.js';
 import React from 'react';
-import { Button } from '@polkadot/ui-app';
-import TxModal, { TxModalState as State, TxModalProps } from '@polkadot/ui-app/TxModal';
+import { Button } from '@polkadot/react-components';
+import TxModal, { TxModalState as State, TxModalProps } from '@polkadot/react-components/TxModal';
 
 import translate from '../translate';
 

packages/app-council/src/Overview/Summary.tsx

@@ -3,11 +3,11 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 import { ComponentProps } from './types';
 
 import React from 'react';
-import { SummaryBox, CardSummary } from '@polkadot/ui-app';
+import { SummaryBox, CardSummary } from '@polkadot/react-components';
 import { formatNumber } from '@polkadot/util';
 
 import translate from '../translate';

packages/app-council/src/Overview/Vote.tsx

@@ -4,16 +4,16 @@
 
 import { VoteIndex } from '@polkadot/types/interfaces';
 import { DerivedVoterPositions } from '@polkadot/api-derive/types';
-import { ApiProps } from '@polkadot/ui-api/types';
+import { ApiProps } from '@polkadot/react-api/types';
 import { ComponentProps } from './types';
 
 import BN from 'bn.js';
 import React from 'react';
 import styled from 'styled-components';
 import { createType } from '@polkadot/types';
-import { withApi, withCalls, withMulti } from '@polkadot/ui-api';
-import { AddressRow, Button, Icon, Toggle, TxButton } from '@polkadot/ui-app';
-import TxModal, { TxModalState, TxModalProps } from '@polkadot/ui-app/TxModal';
+import { withApi, withCalls, withMulti } from '@polkadot/react-api';
+import { AddressRow, Button, Icon, Toggle, TxButton } from '@polkadot/react-components';
+import TxModal, { TxModalState, TxModalProps } from '@polkadot/react-components/TxModal';
 
 import translate from '../translate';
 

packages/app-council/src/Overview/index.tsx

@@ -8,8 +8,8 @@ import { ComponentProps as Props } from './types';
 
 import BN from 'bn.js';
 import React from 'react';
-import { withCalls } from '@polkadot/ui-api';
-import { Button } from '@polkadot/ui-app';
+import { withCalls } from '@polkadot/react-api';
+import { Button } from '@polkadot/react-components';
 
 import Members from './Members';
 import SubmitCandidacy from './SubmitCandidacy';

packages/app-council/src/index.tsx

@@ -2,12 +2,12 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { AppProps, BareProps, I18nProps } from '@polkadot/ui-app/types';
-import { TabItem } from '@polkadot/ui-app/Tabs';
+import { AppProps, BareProps, I18nProps } from '@polkadot/react-components/types';
+import { TabItem } from '@polkadot/react-components/Tabs';
 
 import React from 'react';
 import { Route, Switch } from 'react-router';
-import { Tabs } from '@polkadot/ui-app';
+import { Tabs } from '@polkadot/react-components';
 
 import Overview from './Overview';
 import Motions from './Motions';

packages/app-dashboard/package.json

@@ -12,6 +12,6 @@
   "dependencies": {
     "@babel/runtime": "^7.5.5",
     "@polkadot/apps-routing": "^0.34.0-beta.119",
-    "@polkadot/ui-app": "^0.34.0-beta.119"
+    "@polkadot/react-components": "^0.34.0-beta.119"
   }
 }

packages/app-dashboard/src/Entry.tsx

@@ -3,12 +3,12 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { Route } from '@polkadot/apps-routing/types';
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 
 import React from 'react';
 import { Link } from 'react-router-dom';
 import styled from 'styled-components';
-import { Icon } from '@polkadot/ui-app';
+import { Icon } from '@polkadot/react-components';
 
 import translate from './translate';
 

packages/app-dashboard/src/index.tsx

@@ -3,7 +3,7 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { Route } from '@polkadot/apps-routing/types';
-import { AppProps } from '@polkadot/ui-app/types';
+import { AppProps } from '@polkadot/react-components/types';
 
 import React from 'react';
 import styled from 'styled-components';

packages/app-democracy/package.json

@@ -11,7 +11,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime": "^7.5.5",
-    "@polkadot/ui-app": "^0.34.0-beta.119",
-    "@polkadot/ui-reactive": "^0.34.0-beta.119"
+    "@polkadot/react-components": "^0.34.0-beta.119",
+    "@polkadot/react-query": "^0.34.0-beta.119"
   }
 }

packages/app-democracy/src/Overview/Proposal.tsx

@@ -4,13 +4,13 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { AccountId, Balance, Proposal } from '@polkadot/types/interfaces';
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 
 import BN from 'bn.js';
 import React from 'react';
 import { Option, Tuple, Vec } from '@polkadot/types';
-import { ActionItem, InputAddress, Labelled, Static } from '@polkadot/ui-app';
-import { withCalls, withMulti } from '@polkadot/ui-api';
+import { ActionItem, InputAddress, Labelled, Static } from '@polkadot/react-components';
+import { withCalls, withMulti } from '@polkadot/react-api';
 import { formatBalance } from '@polkadot/util';
 
 import translate from '../translate';

packages/app-democracy/src/Overview/Proposals.tsx

@@ -4,12 +4,12 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { Proposal } from '@polkadot/types/interfaces';
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 
 import BN from 'bn.js';
 import React from 'react';
-import { withCalls, withMulti } from '@polkadot/ui-api';
-import { Column } from '@polkadot/ui-app';
+import { withCalls, withMulti } from '@polkadot/react-api';
+import { Column } from '@polkadot/react-components';
 
 import ProposalDisplay from './Proposal';
 import translate from '../translate';

packages/app-democracy/src/Overview/Referendum.tsx

@@ -4,17 +4,17 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { DerivedReferendumVote } from '@polkadot/api-derive/types';
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 import { ReferendumInfoExtended } from '@polkadot/api-derive/type';
 
 import BN from 'bn.js';
 import React from 'react';
 import styled from 'styled-components';
-import { ActionItem, Chart, Static, Voting } from '@polkadot/ui-app';
+import { ActionItem, Chart, Static, Voting } from '@polkadot/react-components';
 import { formatBalance, formatNumber } from '@polkadot/util';
 import settings from '@polkadot/ui-settings';
-import VoteThreshold from '@polkadot/ui-params/Param/VoteThreshold';
-import { withCalls, withMulti } from '@polkadot/ui-api';
+import VoteThreshold from '@polkadot/react-params/Param/VoteThreshold';
+import { withCalls, withMulti } from '@polkadot/react-api';
 
 import translate from '../translate';
 

packages/app-democracy/src/Overview/Referendums.tsx

@@ -3,13 +3,13 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 
 import React from 'react';
 import { ReferendumInfoExtended } from '@polkadot/api-derive/type';
 import { Option } from '@polkadot/types';
-import { withCalls } from '@polkadot/ui-api';
-import { Column } from '@polkadot/ui-app';
+import { withCalls } from '@polkadot/react-api';
+import { Column } from '@polkadot/react-components';
 
 import Referendum from './Referendum';
 import translate from '../translate';

packages/app-democracy/src/Overview/Seconding.tsx

@@ -3,14 +3,14 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { AccountId } from '@polkadot/types/interfaces';
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 import { SubjectInfo } from '@polkadot/ui-keyring/observable/types';
 
 import BN from 'bn.js';
 import React from 'react';
-import { Button, InputAddress, Modal, TxButton } from '@polkadot/ui-app';
+import { Button, InputAddress, Modal, TxButton } from '@polkadot/react-components';
 import accountObservable from '@polkadot/ui-keyring/observable/accounts';
-import { withMulti, withObservable } from '@polkadot/ui-api';
+import { withMulti, withObservable } from '@polkadot/react-api';
 
 import translate from '../translate';
 

packages/app-democracy/src/Overview/Summary.tsx

@@ -3,12 +3,12 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 
 import BN from 'bn.js';
 import React from 'react';
-import { SummaryBox, CardSummary } from '@polkadot/ui-app';
-import { withCalls } from '@polkadot/ui-api';
+import { SummaryBox, CardSummary } from '@polkadot/react-components';
+import { withCalls } from '@polkadot/react-api';
 import { formatNumber } from '@polkadot/util';
 
 import translate from '../translate';

packages/app-democracy/src/Overview/Voting.tsx

@@ -2,14 +2,14 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 import { SubjectInfo } from '@polkadot/ui-keyring/observable/types';
 
 import BN from 'bn.js';
 import React from 'react';
-import { Button, Dropdown, InputAddress, Modal, TxButton } from '@polkadot/ui-app';
+import { Button, Dropdown, InputAddress, Modal, TxButton } from '@polkadot/react-components';
 import accountObservable from '@polkadot/ui-keyring/observable/accounts';
-import { withMulti, withObservable } from '@polkadot/ui-api';
+import { withMulti, withObservable } from '@polkadot/react-api';
 
 import translate from '../translate';
 

packages/app-democracy/src/Overview/index.tsx

@@ -2,10 +2,10 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { AppProps, BareProps, I18nProps } from '@polkadot/ui-app/types';
+import { AppProps, BareProps, I18nProps } from '@polkadot/react-components/types';
 
 import React from 'react';
-import { Columar } from '@polkadot/ui-app';
+import { Columar } from '@polkadot/react-components';
 
 import Proposals from './Proposals';
 import Referendums from './Referendums';

packages/app-democracy/src/Propose.tsx

@@ -3,16 +3,16 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { Call } from '@polkadot/types/interfaces';
-import { I18nProps } from '@polkadot/ui-app/types';
-import { ApiProps } from '@polkadot/ui-api/types';
+import { I18nProps } from '@polkadot/react-components/types';
+import { ApiProps } from '@polkadot/react-api/types';
 
 import BN from 'bn.js';
 import React from 'react';
 import { RouteComponentProps } from 'react-router';
 import { withRouter } from 'react-router-dom';
 import { createType } from '@polkadot/types';
-import { Button, Extrinsic, InputAddress, InputBalance, TxButton, TxComponent } from '@polkadot/ui-app';
-import { withApi, withMulti } from '@polkadot/ui-api';
+import { Button, Extrinsic, InputAddress, InputBalance, TxButton, TxComponent } from '@polkadot/react-components';
+import { withApi, withMulti } from '@polkadot/react-api';
 
 import translate from './translate';
 

packages/app-democracy/src/index.tsx

@@ -2,12 +2,12 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { AppProps, BareProps, I18nProps } from '@polkadot/ui-app/types';
-import { TabItem } from '@polkadot/ui-app/Tabs';
+import { AppProps, BareProps, I18nProps } from '@polkadot/react-components/types';
+import { TabItem } from '@polkadot/react-components/Tabs';
 
 import React from 'react';
 import { Route, Switch } from 'react-router';
-import { HelpOverlay, Tabs } from '@polkadot/ui-app';
+import { HelpOverlay, Tabs } from '@polkadot/react-components';
 import uiSettings from '@polkadot/ui-settings';
 
 import basicMd from './md/basic.md';

packages/app-explorer/package.json

@@ -11,6 +11,6 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime": "^7.5.5",
-    "@polkadot/ui-app": "^0.34.0-beta.119"
+    "@polkadot/react-components": "^0.34.0-beta.119"
   }
 }

packages/app-explorer/src/BestHash.tsx

@@ -1,13 +1,13 @@
 /* eslint-disable @typescript-eslint/camelcase */
-// Copyright 2017-2019 @polkadot/ui-reactive authors & contributors
+// Copyright 2017-2019 @polkadot/react-query authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { Header } from '@polkadot/types/interfaces';
-import { BareProps, CallProps } from '@polkadot/ui-api/types';
+import { BareProps, CallProps } from '@polkadot/react-api/types';
 
 import React from 'react';
-import { withCalls } from '@polkadot/ui-api';
+import { withCalls } from '@polkadot/react-api';
 
 type Props = BareProps & CallProps & {
   label?: string;

packages/app-explorer/src/BlockHeader/index.tsx

@@ -2,14 +2,14 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { BareProps } from '@polkadot/ui-app/types';
+import { BareProps } from '@polkadot/react-components/types';
 
 import './BlockHeader.css';
 
 import React from 'react';
 import { Link } from 'react-router-dom';
 import { HeaderExtended } from '@polkadot/api-derive';
-import { AddressMini, LinkPolkascan } from '@polkadot/ui-app';
+import { AddressMini, LinkPolkascan } from '@polkadot/react-components';
 import { formatNumber } from '@polkadot/util';
 
 interface Props extends BareProps {

packages/app-explorer/src/BlockHeaders.tsx

@@ -2,11 +2,11 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { CallProps } from '@polkadot/ui-api/types';
+import { CallProps } from '@polkadot/react-api/types';
 
 import React from 'react';
 import { HeaderExtended } from '@polkadot/api-derive';
-import { withCalls } from '@polkadot/ui-api';
+import { withCalls } from '@polkadot/react-api';
 
 import BlockHeader from './BlockHeader';
 

packages/app-explorer/src/BlockInfo/ByHash.tsx

@@ -4,13 +4,13 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { EventRecord, SignedBlock } from '@polkadot/types/interfaces';
-import { I18nProps } from '@polkadot/ui-app/types';
-import { ApiProps } from '@polkadot/ui-api/types';
+import { I18nProps } from '@polkadot/react-components/types';
+import { ApiProps } from '@polkadot/react-api/types';
 
 import React from 'react';
 import { HeaderExtended } from '@polkadot/api-derive';
-import { withCalls } from '@polkadot/ui-api';
-import { Columar } from '@polkadot/ui-app';
+import { withCalls } from '@polkadot/react-api';
+import { Columar } from '@polkadot/react-components';
 
 import BlockHeader from '../BlockHeader';
 import translate from '../translate';

packages/app-explorer/src/BlockInfo/ByNumber.tsx

@@ -4,10 +4,10 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { Hash } from '@polkadot/types/interfaces';
-import { ApiProps } from '@polkadot/ui-api/types';
+import { ApiProps } from '@polkadot/react-api/types';
 
 import React from 'react';
-import { withCalls } from '@polkadot/ui-api';
+import { withCalls } from '@polkadot/react-api';
 
 import BlockByHash from './ByHash';
 

packages/app-explorer/src/BlockInfo/Events.tsx

@@ -3,10 +3,10 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { EventRecord } from '@polkadot/types/interfaces';
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 
 import React from 'react';
-import { Column } from '@polkadot/ui-app';
+import { Column } from '@polkadot/react-components';
 
 import EventsDisplay from '../Events';
 import translate from '../translate';

packages/app-explorer/src/BlockInfo/Extrinsics.tsx

@@ -3,12 +3,12 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { BlockNumber, Extrinsic } from '@polkadot/types/interfaces';
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 
 import React from 'react';
 import styled from 'styled-components';
 import { GenericCall } from '@polkadot/types';
-import { AddressMini, Call, Column, LinkPolkascan } from '@polkadot/ui-app';
+import { AddressMini, Call, Column, LinkPolkascan } from '@polkadot/react-components';
 import { formatNumber } from '@polkadot/util';
 
 import translate from '../translate';

packages/app-explorer/src/BlockInfo/Logs.tsx

@@ -4,12 +4,12 @@
 
 import { DigestItem } from '@polkadot/types/interfaces';
 import { Codec, TypeDef } from '@polkadot/types/types';
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 
 import React from 'react';
 import { Struct, Tuple, U8a, Vec, getTypeDef } from '@polkadot/types';
-import { Column } from '@polkadot/ui-app';
-import Params from '@polkadot/ui-params';
+import { Column } from '@polkadot/react-components';
+import Params from '@polkadot/react-params';
 
 import translate from '../translate';
 

packages/app-explorer/src/BlockInfo/index.tsx

@@ -4,10 +4,10 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { BlockNumber } from '@polkadot/types/interfaces';
-import { BareProps } from '@polkadot/ui-app/types';
+import { BareProps } from '@polkadot/react-components/types';
 
 import React from 'react';
-import { withCalls, withMulti } from '@polkadot/ui-api';
+import { withCalls, withMulti } from '@polkadot/react-api';
 import { isHex } from '@polkadot/util';
 
 import Query from '../Query';

packages/app-explorer/src/Events.tsx

@@ -2,11 +2,11 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 import { KeyedEvent } from './types';
 
 import React from 'react';
-import { Event as EventDisplay } from '@polkadot/ui-app';
+import { Event as EventDisplay } from '@polkadot/react-components';
 import { formatNumber } from '@polkadot/util';
 
 import translate from './translate';

packages/app-explorer/src/Main.tsx

@@ -2,11 +2,11 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 import { KeyedEvent } from './types';
 
 import React from 'react';
-import { Columar, Column } from '@polkadot/ui-app';
+import { Columar, Column } from '@polkadot/react-components';
 
 import BlockHeaders from './BlockHeaders';
 import Events from './Events';

packages/app-explorer/src/NodeInfo/Peers.tsx

@@ -3,7 +3,7 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { PeerInfo } from '@polkadot/types/interfaces';
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 
 import React from 'react';
 import { formatNumber } from '@polkadot/util';

packages/app-explorer/src/NodeInfo/Summary.tsx

@@ -2,14 +2,14 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 import { Info } from './types';
 
 import BN from 'bn.js';
 import React from 'react';
-import { SummaryBox, CardSummary } from '@polkadot/ui-app';
+import { SummaryBox, CardSummary } from '@polkadot/react-components';
 import { formatNumber } from '@polkadot/util';
-import { BestNumber, Elapsed } from '@polkadot/ui-reactive';
+import { BestNumber, Elapsed } from '@polkadot/react-query';
 
 import translate from './translate';
 

packages/app-explorer/src/NodeInfo/index.tsx

@@ -3,12 +3,12 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { Health, PeerInfo, Extrinsic } from '@polkadot/types/interfaces';
-import { ApiProps } from '@polkadot/ui-api/types';
-import { AppProps, I18nProps } from '@polkadot/ui-app/types';
+import { ApiProps } from '@polkadot/react-api/types';
+import { AppProps, I18nProps } from '@polkadot/react-components/types';
 import { Info } from './types';
 
 import React from 'react';
-import { withApi, withMulti } from '@polkadot/ui-api';
+import { withApi, withMulti } from '@polkadot/react-api';
 import { Vec } from '@polkadot/types';
 
 import './index.css';

packages/app-explorer/src/Query.tsx

@@ -2,11 +2,11 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 
 import React from 'react';
 import styled from 'styled-components';
-import { Button, FilterOverlay, Input, TxComponent } from '@polkadot/ui-app';
+import { Button, FilterOverlay, Input, TxComponent } from '@polkadot/react-components';
 import { isHex } from '@polkadot/util';
 
 import translate from './translate';

packages/app-explorer/src/Summary.tsx

@@ -2,11 +2,11 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 
 import React from 'react';
-import { SummaryBox, CardSummary } from '@polkadot/ui-app';
-import { BestFinalized, BestNumber, TimeNow, TimePeriod, TotalIssuance } from '@polkadot/ui-reactive';
+import { SummaryBox, CardSummary } from '@polkadot/react-components';
+import { BestFinalized, BestNumber, TimeNow, TimePeriod, TotalIssuance } from '@polkadot/react-query';
 
 import SummarySession from './SummarySession';
 import translate from './translate';

packages/app-explorer/src/SummarySession.tsx

@@ -4,11 +4,11 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { DerivedSessionInfo } from '@polkadot/api-derive/types';
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 
 import React from 'react';
-import { CardSummary } from '@polkadot/ui-app';
-import { withCalls } from '@polkadot/ui-api';
+import { CardSummary } from '@polkadot/react-components';
+import { withCalls } from '@polkadot/react-api';
 
 import translate from './translate';
 import { formatNumber } from '@polkadot/util';

packages/app-explorer/src/index.tsx

@@ -4,7 +4,7 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { EventRecord } from '@polkadot/types/interfaces';
-import { AppProps, BareProps, I18nProps } from '@polkadot/ui-app/types';
+import { AppProps, BareProps, I18nProps } from '@polkadot/react-components/types';
 import { KeyedEvent } from './types';
 
 import './index.css';
@@ -12,8 +12,8 @@ import './index.css';
 import React from 'react';
 import { Route, Switch } from 'react-router';
 import styled from 'styled-components';
-import { withCalls, withMulti } from '@polkadot/ui-api';
-import Tabs, { TabItem } from '@polkadot/ui-app/Tabs';
+import { withCalls, withMulti } from '@polkadot/react-api';
+import Tabs, { TabItem } from '@polkadot/react-components/Tabs';
 import uiSettings from '@polkadot/ui-settings';
 import { stringToU8a } from '@polkadot/util';
 import { xxhashAsHex } from '@polkadot/util-crypto';

packages/app-extrinsics/package.json

@@ -11,8 +11,8 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime": "^7.5.5",
-    "@polkadot/ui-app": "^0.34.0-beta.119",
-    "@polkadot/ui-params": "^0.34.0-beta.119",
-    "@polkadot/ui-signer": "^0.34.0-beta.119"
+    "@polkadot/react-components": "^0.34.0-beta.119",
+    "@polkadot/react-params": "^0.34.0-beta.119",
+    "@polkadot/react-signer": "^0.34.0-beta.119"
   }
 }

packages/app-extrinsics/src/Balance.tsx

@@ -1,14 +1,14 @@
 /* eslint-disable @typescript-eslint/camelcase */
-// Copyright 2017-2019 @polkadot/ui-reactive authors & contributors
+// Copyright 2017-2019 @polkadot/react-query authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { BareProps, CallProps } from '@polkadot/ui-api/types';
+import { BareProps, CallProps } from '@polkadot/react-api/types';
 
 import React from 'react';
 import { DerivedBalances } from '@polkadot/api-derive/types';
-import { withCalls, withMulti } from '@polkadot/ui-api';
-import { InputBalance } from '@polkadot/ui-app';
+import { withCalls, withMulti } from '@polkadot/react-api';
+import { InputBalance } from '@polkadot/react-components';
 
 type Props = BareProps & CallProps & {
   balances_all?: DerivedBalances;

packages/app-extrinsics/src/Selection.tsx

@@ -3,16 +3,16 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { Call } from '@polkadot/types/interfaces';
-import { I18nProps } from '@polkadot/ui-app/types';
-import { QueueTxExtrinsicAdd } from '@polkadot/ui-app/Status/types';
-import { ApiProps } from '@polkadot/ui-api/types';
+import { I18nProps } from '@polkadot/react-components/types';
+import { QueueTxExtrinsicAdd } from '@polkadot/react-components/Status/types';
+import { ApiProps } from '@polkadot/react-api/types';
 import { SubmittableExtrinsic } from '@polkadot/api/promise/types';
 
 import BN from 'bn.js';
 import React from 'react';
-import { Button, Extrinsic, InputAddress, Labelled, TxButton, TxComponent } from '@polkadot/ui-app';
-import { withApi, withMulti } from '@polkadot/ui-api';
-import { Nonce } from '@polkadot/ui-reactive';
+import { Button, Extrinsic, InputAddress, Labelled, TxButton, TxComponent } from '@polkadot/react-components';
+import { withApi, withMulti } from '@polkadot/react-api';
+import { Nonce } from '@polkadot/react-query';
 
 import Balance from './Balance';
 import translate from './translate';

packages/app-extrinsics/src/index.tsx

@@ -2,10 +2,10 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { AppProps, I18nProps } from '@polkadot/ui-app/types';
+import { AppProps, I18nProps } from '@polkadot/react-components/types';
 
 import React from 'react';
-import { Tabs } from '@polkadot/ui-app';
+import { Tabs } from '@polkadot/react-components';
 
 import Selection from './Selection';
 import translate from './translate';

packages/app-js/package.json

@@ -11,7 +11,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime": "^7.5.5",
-    "@polkadot/ui-app": "^0.34.0-beta.119",
+    "@polkadot/react-components": "^0.34.0-beta.119",
     "snappyjs": "^0.6.0"
   }
 }

packages/app-js/src/ActionButtons.tsx

@@ -2,11 +2,11 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { BareProps, I18nProps } from '@polkadot/ui-app/types';
+import { BareProps, I18nProps } from '@polkadot/react-components/types';
 
 import React from 'react';
 import { Button as SUIB, Popup } from 'semantic-ui-react';
-import { Button, Input } from '@polkadot/ui-app';
+import { Button, Input } from '@polkadot/react-components';
 
 import translate from './translate';
 

packages/app-js/src/Output.tsx

@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { BareProps } from '@polkadot/ui-app/types';
+import { BareProps } from '@polkadot/react-components/types';
 import { Log } from './types';
 
 import React from 'react';

packages/app-js/src/Playground.tsx

@@ -4,16 +4,16 @@
 
 import { ApiPromise } from '@polkadot/api';
 import { KeyringInstance } from '@polkadot/keyring/types';
-import { ApiProps } from '@polkadot/ui-api/types';
-import { AppProps, I18nProps } from '@polkadot/ui-app/types';
+import { ApiProps } from '@polkadot/react-api/types';
+import { AppProps, I18nProps } from '@polkadot/react-components/types';
 import { Log, LogType, Snippet } from './types';
 
 import React from 'react';
 import { withRouter } from 'react-router';
 import { Transition } from 'semantic-ui-react';
 import snappy from 'snappyjs';
-import { withApi, withMulti } from '@polkadot/ui-api';
-import { Button, Dropdown, Editor } from '@polkadot/ui-app';
+import { withApi, withMulti } from '@polkadot/react-api';
+import { Button, Dropdown, Editor } from '@polkadot/react-components';
 import uiKeyring from '@polkadot/ui-keyring';
 import * as types from '@polkadot/types';
 import * as util from '@polkadot/util';

packages/app-js/src/index.tsx

@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { AppProps, BareProps } from '@polkadot/ui-app/types';
+import { AppProps, BareProps } from '@polkadot/react-components/types';
 
 import React from 'react';
 import { Route, Switch } from 'react-router';

packages/app-parachains/package.json

@@ -11,7 +11,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime": "^7.4.5",
-    "@polkadot/ui-app": "^0.34.0-beta.119",
-    "@polkadot/ui-reactive": "^0.34.0-beta.119"
+    "@polkadot/react-components": "^0.34.0-beta.119",
+    "@polkadot/react-query": "^0.34.0-beta.119"
   }
 }

packages/app-parachains/src/Overview/Parachain.tsx

@@ -3,15 +3,15 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { I18nProps } from '@polkadot/ui-app/types';
+import { I18nProps } from '@polkadot/react-components/types';
 
 import BN from 'bn.js';
 import React from 'react';
 import styled from 'styled-components';
 import { Bytes, Option } from '@polkadot/types';
-import { Card, Static } from '@polkadot/ui-app';
-import { styles as rowStyles } from '@polkadot/ui-app/Row';
-import { withCalls, withMulti } from '@polkadot/ui-api';
+import { Card, Static } from '@polkadot/react-components';
+import { styles as rowStyles } from '@polkadot/react-components/Row';
+import { withCalls, withMulti } from '@polkadot/react-api';
 import { formatNumber } from '@polkadot/util';
 
 import translate from '../translate';