Remove /index imports (swap to bare) (#814)

* Remove /index imports (swap to bare)

* Bump deps

package.json

@@ -10,11 +10,11 @@
     "packages/*"
   ],
   "resolutions": {
-    "@polkadot/api": "^0.46.10",
-    "@polkadot/keyring": "^0.35.10",
-    "@polkadot/types": "^0.46.10",
-    "@polkadot/util": "^0.35.10",
-    "@polkadot/util-crypto": "^0.35.10",
+    "@polkadot/api": "^0.46.12",
+    "@polkadot/keyring": "^0.36.3",
+    "@polkadot/types": "^0.46.12",
+    "@polkadot/util": "^0.36.3",
+    "@polkadot/util-crypto": "^0.36.3",
     "babel-core": "^7.0.0-bridge.0",
     "rxjs": "^6.4.0",
     "typescript": "^3.3.3333"

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

@@ -3,8 +3,8 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import React from 'react';
-import { Bubble, InputAddress } from '@polkadot/ui-app/index';
-import { AccountIndex, Balance, Nonce } from '@polkadot/ui-reactive/index';
+import { Bubble, InputAddress } from '@polkadot/ui-app';
+import { AccountIndex, Balance, Nonce } from '@polkadot/ui-reactive';
 
 type Props = {
   onChange: (accountId?: string) => void

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

@@ -9,7 +9,7 @@ import BN from 'bn.js';
 import React from 'react';
 import { AccountId, RuntimeVersion } from '@polkadot/types';
 import { withCalls } from '@polkadot/ui-api/with';
-import { Bubble, IdentityIcon } from '@polkadot/ui-app/index';
+import { Bubble, IdentityIcon } from '@polkadot/ui-app';
 import { formatBalance, formatNumber } from '@polkadot/ui-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 } from '@polkadot/ui-app/index';
+import { Button, InputAddress, InputBalance, TxButton } from '@polkadot/ui-app';
 
 type Props = {
   accountId?: string

packages/app-accounts/src/Backup.tsx

@@ -7,7 +7,7 @@ import { I18nProps } from '@polkadot/ui-app/types';
 
 import FileSaver from 'file-saver';
 import React from 'react';
-import { AddressSummary, Button, Modal, Password } from '@polkadot/ui-app/index';
+import { AddressSummary, Button, Modal, Password } from '@polkadot/ui-app';
 import { ActionStatus } from '@polkadot/ui-app/Status/types';
 import keyring from '@polkadot/ui-keyring';
 

packages/app-accounts/src/ChangePass.tsx

@@ -6,7 +6,7 @@ import { KeyringPair } from '@polkadot/keyring/types';
 import { I18nProps } from '@polkadot/ui-app/types';
 
 import React from 'react';
-import { AddressSummary, Button, Modal, Password } from '@polkadot/ui-app/index';
+import { AddressSummary, Button, Modal, Password } from '@polkadot/ui-app';
 import { ActionStatus } from '@polkadot/ui-app/Status/types';
 import keyring from '@polkadot/ui-keyring';
 

packages/app-accounts/src/Creator.tsx

@@ -7,7 +7,7 @@ import { ActionStatus } from '@polkadot/ui-app/Status/types';
 import { ComponentProps } from './types';
 
 import React from 'react';
-import { AddressSummary, Button, Dropdown, Input, Modal, Password } from '@polkadot/ui-app/index';
+import { AddressSummary, Button, Dropdown, Input, Modal, Password } from '@polkadot/ui-app';
 import { InputAddress } from '@polkadot/ui-app/InputAddress';
 import { hexToU8a, isHex, stringToU8a, u8aToHex } from '@polkadot/util';
 import { mnemonicToSeed, mnemonicValidate, naclKeypairFromSeed, randomAsU8a } from '@polkadot/util-crypto';

packages/app-accounts/src/Editor.tsx

@@ -9,7 +9,7 @@ import { SubjectInfo } from '@polkadot/ui-keyring/observable/types';
 import { ComponentProps } from './types';
 
 import React from 'react';
-import { AddressSummary, Button, Input, InputAddress } from '@polkadot/ui-app/index';
+import { AddressSummary, Button, Input, InputAddress } from '@polkadot/ui-app';
 import keyring from '@polkadot/ui-keyring';
 
 import Backup from './Backup';

packages/app-accounts/src/Forgetting.tsx

@@ -5,7 +5,7 @@
 import { I18nProps } from '@polkadot/ui-app/types';
 
 import React from 'react';
-import { AddressSummary, Button, Modal } from '@polkadot/ui-app/index';
+import { AddressSummary, Button, Modal } from '@polkadot/ui-app';
 
 import translate from './translate';
 

packages/app-accounts/src/Restore.tsx

@@ -7,7 +7,7 @@ import { I18nProps } from '@polkadot/ui-app/types';
 import { ComponentProps } from './types';
 
 import React from 'react';
-import { AddressSummary, Button, InputFile, Password } from '@polkadot/ui-app/index';
+import { AddressSummary, Button, InputFile, Password } from '@polkadot/ui-app';
 import { InputAddress } from '@polkadot/ui-app/InputAddress';
 import { isHex, isObject, u8aToString } from '@polkadot/util';
 import keyring from '@polkadot/ui-keyring';

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

@@ -5,7 +5,7 @@
 import { BareProps } from '@polkadot/ui-app/types';
 
 import React from 'react';
-import { Button, IdentityIcon } from '@polkadot/ui-app/index';
+import { Button, IdentityIcon } from '@polkadot/ui-app';
 import { u8aToHex } from '@polkadot/util';
 
 type Props = BareProps & {

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

@@ -9,7 +9,7 @@ import { ComponentProps } from '../types';
 import './index.css';
 
 import React from 'react';
-import { Button, Dropdown, Input } from '@polkadot/ui-app/index';
+import { Button, Dropdown, Input } from '@polkadot/ui-app';
 
 import generator from '../vanitygen';
 import matchRegex from '../vanitygen/regex';

packages/app-accounts/src/index.tsx

@@ -12,8 +12,8 @@ import './index.css';
 import React from 'react';
 import { Route, Switch } from 'react-router';
 import accountObservable from '@polkadot/ui-keyring/observable/accounts';
-import { Tabs } from '@polkadot/ui-app/index';
-import { withMulti, withObservable } from '@polkadot/ui-api/index';
+import { Tabs } from '@polkadot/ui-app';
+import { withMulti, withObservable } from '@polkadot/ui-api';
 
 import Creator from './Creator';
 import Editor from './Editor';

packages/app-accounts/src/vanitygen/cli.ts

@@ -7,7 +7,7 @@ import yargs from 'yargs';
 import chalk from 'chalk';
 import { u8aToHex } from '@polkadot/util';
 
-import generator from './index';
+import generator from '.';
 import matchRegex from './regex';
 import { pkFromSeed } from './sodium';
 

packages/app-addresses/src/Creator.tsx

@@ -7,7 +7,7 @@ import { ComponentProps } from './types';
 
 import React from 'react';
 
-import { AddressSummary, Button, Input } from '@polkadot/ui-app/index';
+import { AddressSummary, Button, Input } from '@polkadot/ui-app';
 import { ActionStatus } from '@polkadot/ui-app/Status/types';
 import { InputAddress } from '@polkadot/ui-app/InputAddress';
 import keyring from '@polkadot/ui-keyring';

packages/app-addresses/src/Editor.tsx

@@ -7,7 +7,7 @@ import { I18nProps } from '@polkadot/ui-app/types';
 import { ComponentProps } from './types';
 
 import React from 'react';
-import { AddressSummary, Button, Input, InputAddress } from '@polkadot/ui-app/index';
+import { AddressSummary, Button, Input, InputAddress } from '@polkadot/ui-app';
 import { ActionStatus } from '@polkadot/ui-app/Status/types';
 import keyring from '@polkadot/ui-keyring';
 

packages/app-addresses/src/Forgetting.tsx

@@ -6,7 +6,7 @@ import { KeyringAddress } from '@polkadot/ui-keyring/types';
 import { I18nProps } from '@polkadot/ui-app/types';
 
 import React from 'react';
-import { AddressSummary, Button, Modal } from '@polkadot/ui-app/index';
+import { AddressSummary, Button, Modal } from '@polkadot/ui-app';
 
 import translate from './translate';
 

packages/app-addresses/src/index.tsx

@@ -12,7 +12,7 @@ import React from 'react';
 import { Route, Switch } from 'react-router';
 import addressObservable from '@polkadot/ui-keyring/observable/addresses';
 import Tabs, { TabItem } from '@polkadot/ui-app/Tabs';
-import { withMulti, withObservable } from '@polkadot/ui-api/index';
+import { withMulti, withObservable } from '@polkadot/ui-api';
 
 import Creator from './Creator';
 import Editor from './Editor';

packages/app-democracy/src/Item.tsx

@@ -7,7 +7,7 @@ import { I18nProps } from '@polkadot/ui-app/types';
 import BN from 'bn.js';
 import React from 'react';
 import { Method, Proposal } from '@polkadot/types';
-import { Call } from '@polkadot/ui-app/index';
+import { Call } from '@polkadot/ui-app';
 import { formatNumber } from '@polkadot/ui-util';
 
 import translate from './translate';

packages/app-democracy/src/Proposal.tsx

@@ -7,8 +7,8 @@ import { I18nProps } from '@polkadot/ui-app/types';
 import BN from 'bn.js';
 import React from 'react';
 import { AccountId, Balance, Option, Proposal, Tuple, Vector } from '@polkadot/types';
-import { AddressMini, Labelled, Static } from '@polkadot/ui-app/index';
-import { withCall, withMulti } from '@polkadot/ui-api/index';
+import { AddressMini, Labelled, Static } from '@polkadot/ui-app';
+import { withCall, withMulti } from '@polkadot/ui-api';
 import { formatBalance } from '@polkadot/ui-util';
 
 import Item from './Item';

packages/app-democracy/src/Proposals.tsx

@@ -6,7 +6,7 @@ import { I18nProps } from '@polkadot/ui-app/types';
 
 import React from 'react';
 import { Tuple } from '@polkadot/types';
-import { withCall, withMulti } from '@polkadot/ui-api/index';
+import { withCall, withMulti } from '@polkadot/ui-api';
 
 import Proposal from './Proposal';
 import translate from './translate';

packages/app-democracy/src/Referendum.tsx

@@ -9,9 +9,9 @@ import { RawParam } from '@polkadot/ui-params/types';
 import BN from 'bn.js';
 import React from 'react';
 import { ReferendumInfoExtended } from '@polkadot/api-derive/democracy/referendumInfo';
-import { Chart, Static } from '@polkadot/ui-app/index';
+import { Chart, Static } from '@polkadot/ui-app';
 import VoteThreshold from '@polkadot/ui-params/Param/VoteThreshold';
-import { withCalls } from '@polkadot/ui-api/index';
+import { withCalls } from '@polkadot/ui-api';
 import { formatBalance, formatNumber } from '@polkadot/ui-util';
 import settings from '@polkadot/ui-settings';
 

packages/app-democracy/src/Referendums.tsx

@@ -8,7 +8,7 @@ import BN from 'bn.js';
 import React from 'react';
 import { ReferendumInfoExtended } from '@polkadot/api-derive/democracy/referendumInfo';
 import { Option } from '@polkadot/types';
-import { withCalls } from '@polkadot/ui-api/index';
+import { withCalls } from '@polkadot/ui-api';
 
 import Referendum from './Referendum';
 import translate from './translate';

packages/app-democracy/src/Summary.tsx

@@ -6,9 +6,9 @@ import { I18nProps } from '@polkadot/ui-app/types';
 
 import BN from 'bn.js';
 import React from 'react';
-import { CardSummary } from '@polkadot/ui-app/index';
+import { CardSummary } from '@polkadot/ui-app';
 import { formatNumber } from '@polkadot/ui-util';
-import { withCalls } from '@polkadot/ui-api/index';
+import { withCalls } from '@polkadot/ui-api';
 
 import translate from './translate';
 

packages/app-democracy/src/Voting.tsx

@@ -8,10 +8,10 @@ import { SubjectInfo } from '@polkadot/ui-keyring/observable/types';
 
 import BN from 'bn.js';
 import React from 'react';
-import { InputAddress } from '@polkadot/ui-app/index';
+import { InputAddress } from '@polkadot/ui-app';
 import { QueueConsumer } from '@polkadot/ui-app/Status/Context';
 import accountObservable from '@polkadot/ui-keyring/observable/accounts';
-import { withMulti, withObservable } from '@polkadot/ui-api/index';
+import { withMulti, withObservable } from '@polkadot/ui-api';
 
 import VotingButtons from './VotingButtons';
 import translate from './translate';

packages/app-democracy/src/VotingButtons.tsx

@@ -8,8 +8,8 @@ import { ApiProps } from '@polkadot/ui-api/types';
 
 import BN from 'bn.js';
 import React from 'react';
-import { Button } from '@polkadot/ui-app/index';
-import { withApi, withMulti } from '@polkadot/ui-api/index';
+import { Button } from '@polkadot/ui-app';
+import { withApi, withMulti } from '@polkadot/ui-api';
 
 import translate from './translate';
 

packages/app-democracy/src/index.tsx

@@ -7,7 +7,7 @@ import { AppProps, BareProps, I18nProps } from '@polkadot/ui-app/types';
 import './index.css';
 
 import React from 'react';
-import { Tabs } from '@polkadot/ui-app/index';
+import { Tabs } from '@polkadot/ui-app';
 
 import Proposals from './Proposals';
 import Referendums from './Referendums';

packages/app-explorer/src/BestHash.tsx

@@ -6,7 +6,7 @@ import { BareProps, CallProps } from '@polkadot/ui-api/types';
 
 import React from 'react';
 import { Header } from '@polkadot/types';
-import { withCall } from '@polkadot/ui-api/index';
+import { withCall } from '@polkadot/ui-api';
 
 type Props = BareProps & CallProps & {
   label?: string,

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

@@ -9,7 +9,7 @@ import './BlockHeader.css';
 import React from 'react';
 import { Link } from 'react-router-dom';
 import { HeaderExtended } from '@polkadot/types';
-import { AddressMini } from '@polkadot/ui-app/index';
+import { AddressMini } from '@polkadot/ui-app';
 import { formatNumber } from '@polkadot/ui-util';
 
 type Props = BareProps & {

packages/app-explorer/src/BlockHeaders.tsx

@@ -6,7 +6,7 @@ import { CallProps } from '@polkadot/ui-api/types';
 
 import React from 'react';
 import { HeaderExtended } from '@polkadot/types';
-import { withCall } from '@polkadot/ui-api/index';
+import { withCall } from '@polkadot/ui-api';
 
 import BlockHeader from './BlockHeader';
 

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

@@ -7,7 +7,7 @@ import { ApiProps } from '@polkadot/ui-api/types';
 
 import React from 'react';
 import { EventRecord, HeaderExtended, SignedBlock } from '@polkadot/types';
-import { withCalls } from '@polkadot/ui-api/index';
+import { withCalls } from '@polkadot/ui-api';
 
 import BlockHeader from '../BlockHeader';
 import translate from '../translate';

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

@@ -6,7 +6,7 @@ import { ApiProps } from '@polkadot/ui-api/types';
 
 import React from 'react';
 import { Hash } from '@polkadot/types';
-import { withCalls } from '@polkadot/ui-api/index';
+import { withCalls } from '@polkadot/ui-api';
 
 import BlockByHash from './ByHash';
 

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

@@ -5,7 +5,7 @@
 import { I18nProps } from '@polkadot/ui-app/types';
 
 import React from 'react';
-import { AddressMini, Call } from '@polkadot/ui-app/index';
+import { AddressMini, Call } from '@polkadot/ui-app';
 import { formatNumber } from '@polkadot/ui-util';
 import { Extrinsic, Method } from '@polkadot/types';
 

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

@@ -6,7 +6,7 @@ import { I18nProps } from '@polkadot/ui-app/types';
 
 import React from 'react';
 import { DigestItem, Struct, Tuple, U8a, Vector, getTypeDef } from '@polkadot/types';
-import Params from '@polkadot/ui-params/index';
+import Params from '@polkadot/ui-params';
 
 import translate from '../translate';
 

packages/app-explorer/src/BlockQuery/Query.tsx

@@ -5,7 +5,7 @@
 import { I18nProps } from '@polkadot/ui-app/types';
 
 import React from 'react';
-import { Button, Input } from '@polkadot/ui-app/index';
+import { Button, Input } from '@polkadot/ui-app';
 import { isHex } from '@polkadot/util';
 
 import translate from '../translate';

packages/app-explorer/src/Events.tsx

@@ -6,7 +6,7 @@ import { I18nProps } from '@polkadot/ui-app/types';
 
 import React from 'react';
 import { EventRecord } from '@polkadot/types';
-import { Event as EventDisplay } from '@polkadot/ui-app/index';
+import { Event as EventDisplay } from '@polkadot/ui-app';
 import { formatNumber } from '@polkadot/ui-util';
 
 import translate from './translate';

packages/app-explorer/src/EventsRecent.tsx

@@ -6,7 +6,7 @@ import { I18nProps } from '@polkadot/ui-app/types';
 
 import React from 'react';
 import { EventRecord } from '@polkadot/types';
-import { withCall, withMulti } from '@polkadot/ui-api/index';
+import { withCall, withMulti } from '@polkadot/ui-api';
 import { stringToU8a } from '@polkadot/util';
 import { xxhashAsHex } from '@polkadot/util-crypto';
 

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

@@ -7,9 +7,9 @@ import { Info } from './types';
 
 import BN from 'bn.js';
 import React from 'react';
-import { CardSummary } from '@polkadot/ui-app/index';
+import { CardSummary } from '@polkadot/ui-app';
 import { formatNumber } from '@polkadot/ui-util';
-import { BestNumber, Elapsed } from '@polkadot/ui-reactive/index';
+import { BestNumber, Elapsed } from '@polkadot/ui-reactive';
 
 import translate from './translate';
 

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

@@ -7,7 +7,7 @@ import { AppProps, I18nProps } from '@polkadot/ui-app/types';
 import { Info } from './types';
 
 import React from 'react';
-import { withApi, withMulti } from '@polkadot/ui-api/index';
+import { withApi, withMulti } from '@polkadot/ui-api';
 import { Health, PeerInfo, PendingExtrinsics } from '@polkadot/types';
 
 import './index.css';

packages/app-explorer/src/Summary.tsx

@@ -5,8 +5,8 @@
 import { I18nProps } from '@polkadot/ui-app/types';
 
 import React from 'react';
-import { CardSummary } from '@polkadot/ui-app/index';
-import { BestFinalised, BestNumber, TimeNow, TimePeriod } from '@polkadot/ui-reactive/index';
+import { CardSummary } from '@polkadot/ui-app';
+import { BestFinalised, BestNumber, TimeNow, TimePeriod } from '@polkadot/ui-reactive';
 
 import SummarySession from './SummarySession';
 import translate from './translate';

packages/app-explorer/src/SummarySession.tsx

@@ -7,8 +7,8 @@ import { I18nProps } from '@polkadot/ui-app/types';
 import BN from 'bn.js';
 import React from 'react';
 import { BlockNumber } from '@polkadot/types';
-import { CardSummary } from '@polkadot/ui-app/index';
-import { withCalls } from '@polkadot/ui-api/index';
+import { CardSummary } from '@polkadot/ui-app';
+import { withCalls } from '@polkadot/ui-api';
 
 import translate from './translate';
 

packages/app-extrinsics/src/Balance.tsx

@@ -6,8 +6,8 @@ import { BareProps, CallProps } from '@polkadot/ui-api/types';
 
 import React from 'react';
 import { Balance } from '@polkadot/types';
-import { withCall } from '@polkadot/ui-api/index';
-import { InputBalance } from '@polkadot/ui-app/index';
+import { withCall } from '@polkadot/ui-api';
+import { InputBalance } from '@polkadot/ui-app';
 
 type Props = BareProps & CallProps & {
   balances_freeBalance?: Balance,

packages/app-extrinsics/src/Extrinsic.tsx

@@ -10,9 +10,9 @@ import { RawParam } from '@polkadot/ui-params/types';
 import React from 'react';
 import { Method, TypeDef, getTypeDef } from '@polkadot/types';
 
-import { InputExtrinsic } from '@polkadot/ui-app/index';
-import Params from '@polkadot/ui-params/index';
-import { withApi } from '@polkadot/ui-api/index';
+import { InputExtrinsic } from '@polkadot/ui-app';
+import Params from '@polkadot/ui-params';
+import { withApi } from '@polkadot/ui-api';
 import { isUndefined } from '@polkadot/util';
 
 import paramComponents from './Params';

packages/app-extrinsics/src/Params/Call.tsx

@@ -6,7 +6,7 @@ import { Props as BaseProps } from '@polkadot/ui-params/types';
 import { ApiProps } from '@polkadot/ui-api/types';
 
 import React from 'react';
-import { withApi } from '@polkadot/ui-api/index';
+import { withApi } from '@polkadot/ui-api';
 
 import Extrinsic from './Extrinsic';
 

packages/app-extrinsics/src/Params/Proposal.tsx

@@ -7,7 +7,7 @@ import { ApiProps } from '@polkadot/ui-api/types';
 
 import React from 'react';
 import { Proposal } from '@polkadot/types';
-import { withApi } from '@polkadot/ui-api/index';
+import { withApi } from '@polkadot/ui-api';
 
 import ExtrinsicDisplay from './Extrinsic';
 

packages/app-extrinsics/src/Selection.tsx

@@ -9,9 +9,9 @@ import { ApiProps } from '@polkadot/ui-api/types';
 
 import React from 'react';
 import { Method } from '@polkadot/types';
-import { Button, InputAddress, Labelled } from '@polkadot/ui-app/index';
-import { withApi, withMulti } from '@polkadot/ui-api/index';
-import { Nonce } from '@polkadot/ui-reactive/index';
+import { Button, InputAddress, Labelled } from '@polkadot/ui-app';
+import { withApi, withMulti } from '@polkadot/ui-api';
+import { Nonce } from '@polkadot/ui-reactive';
 
 import Balance from './Balance';
 import Extrinsic from './Extrinsic';

packages/app-extrinsics/src/index.tsx

@@ -9,7 +9,7 @@ import './index.css';
 
 import React from 'react';
 import { QueueConsumer } from '@polkadot/ui-app/Status/Context';
-import { Tabs } from '@polkadot/ui-app/index';
+import { Tabs } from '@polkadot/ui-app';
 
 import Selection from './Selection';
 import translate from './translate';

packages/app-js/src/ActionButtons.tsx

@@ -6,7 +6,7 @@ import { BareProps, I18nProps } from '@polkadot/ui-app/types';
 
 import React from 'react';
 import { Button as SUIB, Popup } from 'semantic-ui-react';
-import { Button, Input } from '@polkadot/ui-app/index';
+import { Button, Input } from '@polkadot/ui-app';
 
 import translate from './translate';
 

packages/app-js/src/Playground.tsx

@@ -12,8 +12,8 @@ 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/index';
-import { Button, Dropdown, Editor } from '@polkadot/ui-app/index';
+import { withApi, withMulti } from '@polkadot/ui-api';
+import { Button, Dropdown, Editor } from '@polkadot/ui-app';
 import uiKeyring from '@polkadot/ui-keyring';
 import * as util from '@polkadot/util';
 import * as hashing from '@polkadot/util-crypto';

packages/app-settings/src/Developer.tsx

@@ -7,7 +7,7 @@ import { AppProps, I18nProps } from '@polkadot/ui-app/types';
 import React from 'react';
 import store from 'store';
 import { getTypeRegistry } from '@polkadot/types';
-import { Button, Editor, InputFile } from '@polkadot/ui-app/index';
+import { Button, Editor, InputFile } from '@polkadot/ui-app';
 import { ActionStatus } from '@polkadot/ui-app/Status/types';
 import { isJsonObject, stringToU8a, u8aToString } from '@polkadot/util';
 

packages/app-settings/src/General.tsx

@@ -7,7 +7,7 @@ import { SettingsStruct } from '@polkadot/ui-settings/types';
 
 import React from 'react';
 import { Tab } from 'semantic-ui-react';
-import { Button, Dropdown, Input } from '@polkadot/ui-app/index';
+import { Button, Dropdown, Input } from '@polkadot/ui-app';
 import { ActionStatus } from '@polkadot/ui-app/Status/types';
 import uiSettings from '@polkadot/ui-settings';
 

packages/app-settings/src/index.tsx

@@ -7,7 +7,7 @@ import { TabItem } from '@polkadot/ui-app/Tabs';
 
 import React from 'react';
 import { Route, Switch } from 'react-router';
-import { Tabs } from '@polkadot/ui-app/index';
+import { Tabs } from '@polkadot/ui-app';
 
 import './index.css';
 

packages/app-staking/src/Overview/CurrentList.tsx

@@ -8,7 +8,7 @@ import { I18nProps } from '@polkadot/ui-app/types';
 import React from 'react';
 import { AccountId, Balance, HeaderExtended } from '@polkadot/types';
 import { withCall, withMulti } from '@polkadot/ui-api/with';
-import { AddressMini, AddressRow } from '@polkadot/ui-app/index';
+import { AddressMini, AddressRow } from '@polkadot/ui-app';
 import { formatNumber } from '@polkadot/ui-util';
 import keyring from '@polkadot/ui-keyring';
 

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

@@ -8,9 +8,9 @@ import { I18nProps } from '@polkadot/ui-app/types';
 import BN from 'bn.js';
 import React from 'react';
 import SummarySession from '@polkadot/app-explorer/SummarySession';
-import { CardSummary } from '@polkadot/ui-app/index';
+import { CardSummary } from '@polkadot/ui-app';
 import { formatBalance } from '@polkadot/ui-util';
-import { withCall, withMulti } from '@polkadot/ui-api/index';
+import { withCall, withMulti } from '@polkadot/ui-api';
 
 import translate from '../translate';
 

packages/app-staking/src/StakeList/Account.tsx

@@ -10,8 +10,8 @@ import { ApiProps } from '@polkadot/ui-api/types';
 
 import React from 'react';
 import { AccountId, Balance, Option, ValidatorPrefs } from '@polkadot/types';
-import { AddressMini, AddressSummary, Button } from '@polkadot/ui-app/index';
-import { withCalls } from '@polkadot/ui-api/index';
+import { AddressMini, AddressSummary, Button } from '@polkadot/ui-app';
+import { withCalls } from '@polkadot/ui-api';
 
 import Nominating from './Nominating';
 import Preferences from './Preferences';

packages/app-staking/src/StakeList/Nominating.tsx

@@ -5,7 +5,7 @@
 import { I18nProps } from '@polkadot/ui-app/types';
 
 import React from 'react';
-import { Button, Input, Modal } from '@polkadot/ui-app/index';
+import { Button, Input, Modal } from '@polkadot/ui-app';
 import keyring from '@polkadot/ui-keyring';
 
 import translate from '../translate';

packages/app-staking/src/StakeList/Preferences.tsx

@@ -7,7 +7,7 @@ import { I18nProps } from '@polkadot/ui-app/types';
 import BN from 'bn.js';
 import React from 'react';
 import { ValidatorPrefs } from '@polkadot/types';
-import { Button, InputBalance, InputNumber, Modal } from '@polkadot/ui-app/index';
+import { Button, InputBalance, InputNumber, Modal } from '@polkadot/ui-app';
 
 import translate from '../translate';
 

packages/app-staking/src/StakeList/UnnominateButton.tsx

@@ -5,8 +5,8 @@
 import { I18nProps } from '@polkadot/ui-app/types';
 
 import React from 'react';
-import { Button } from '@polkadot/ui-app/index';
-import { withCall, withMulti } from '@polkadot/ui-api/index';
+import { Button } from '@polkadot/ui-app';
+import { withCall, withMulti } from '@polkadot/ui-api';
 
 import translate from '../translate';
 

packages/app-staking/src/index.tsx

@@ -13,7 +13,7 @@ import { Route, Switch } from 'react-router';
 import { AccountId, Balance } from '@polkadot/types';
 import Tabs, { TabItem } from '@polkadot/ui-app/Tabs';
 import accountObservable from '@polkadot/ui-keyring/observable/accounts';
-import { withCalls, withMulti, withObservable } from '@polkadot/ui-api/index';
+import { withCalls, withMulti, withObservable } from '@polkadot/ui-api';
 
 import './index.css';
 

packages/app-storage/src/Query.tsx

@@ -8,9 +8,9 @@ import { QueryTypes, StorageModuleQuery } from './types';
 
 import React from 'react';
 import { Compact } from '@polkadot/types';
-import { Button, Labelled } from '@polkadot/ui-app/index';
+import { Button, Labelled } from '@polkadot/ui-app';
 import valueToText from '@polkadot/ui-params/valueToText';
-import { withCallDiv } from '@polkadot/ui-api/index';
+import { withCallDiv } from '@polkadot/ui-api';
 import { isU8a, u8aToHex, u8aToString } from '@polkadot/util';
 
 import translate from './translate';

packages/app-storage/src/Selection/Modules.tsx

@@ -10,9 +10,9 @@ import { ApiProps } from '@polkadot/ui-api/types';
 import { ComponentProps } from '../types';
 
 import React from 'react';
-import { Button, InputStorage } from '@polkadot/ui-app/index';
-import Params from '@polkadot/ui-params/index';
-import { withApi, withMulti } from '@polkadot/ui-api/index';
+import { Button, InputStorage } from '@polkadot/ui-app';
+import Params from '@polkadot/ui-params';
+import { withApi, withMulti } from '@polkadot/ui-api';
 import { isUndefined } from '@polkadot/util';
 
 import translate from '../translate';

packages/app-storage/src/Selection/Raw.tsx

@@ -6,7 +6,7 @@ import { I18nProps } from '@polkadot/ui-app/types';
 import { ComponentProps } from '../types';
 
 import React from 'react';
-import { Button, Input } from '@polkadot/ui-app/index';
+import { Button, Input } from '@polkadot/ui-app';
 
 import translate from '../translate';
 import { u8aToU8a } from '@polkadot/util';

packages/app-storage/src/Selection/index.tsx

@@ -8,7 +8,7 @@ import { ComponentProps, QueryTypes, ParitalQueryTypes } from '../types';
 
 import React from 'react';
 import { Route, Switch } from 'react-router';
-import { Tabs } from '@polkadot/ui-app/index';
+import { Tabs } from '@polkadot/ui-app';
 
 import Modules from './Modules';
 import Raw from './Raw';

packages/app-storage/src/index.tsx

@@ -10,7 +10,7 @@ import './index.css';
 import React from 'react';
 
 import Queries from './Queries';
-import Selection from './Selection/index';
+import Selection from './Selection';
 import translate from './translate';
 
 type Props = AppProps & I18nProps;

packages/app-toolbox/src/Hash.tsx

@@ -5,7 +5,7 @@
 import { I18nProps as Props } from '@polkadot/ui-app/types';
 
 import React from 'react';
-import { Input, Output, Static } from '@polkadot/ui-app/index';
+import { Input, Output, Static } from '@polkadot/ui-app';
 import { hexToU8a, isHex, stringToU8a } from '@polkadot/util';
 import { blake2AsHex } from '@polkadot/util-crypto';
 

packages/app-toolbox/src/Rpc/Account.tsx

@@ -6,8 +6,8 @@ import { I18nProps } from '@polkadot/ui-app/types';
 
 import BN from 'bn.js';
 import React from 'react';
-import { InputAddress, Labelled } from '@polkadot/ui-app/index';
-import { Nonce } from '@polkadot/ui-reactive/index';
+import { InputAddress, Labelled } from '@polkadot/ui-app';
+import { Nonce } from '@polkadot/ui-reactive';
 
 import translate from './translate';
 

packages/app-toolbox/src/Rpc/Results.tsx

@@ -6,7 +6,7 @@ import { BareProps } from '@polkadot/ui-app/types';
 import { QueueTx } from '@polkadot/ui-app/Status/types';
 
 import React from 'react';
-import { Output } from '@polkadot/ui-app/index';
+import { Output } from '@polkadot/ui-app';
 import { isUndefined } from '@polkadot/util';
 
 type Props = BareProps & {

packages/app-toolbox/src/Rpc/Selection.tsx

@@ -12,8 +12,8 @@ import './index.css';
 import React from 'react';
 import rpc from '@polkadot/jsonrpc';
 import { getTypeDef } from '@polkadot/types';
-import { Button, InputRpc } from '@polkadot/ui-app/index';
-import Params from '@polkadot/ui-params/index';
+import { Button, InputRpc } from '@polkadot/ui-app';
+import Params from '@polkadot/ui-params';
 
 // import Account from './Account';
 import translate from './translate';

packages/app-toolbox/src/Sign.tsx

@@ -6,7 +6,7 @@ import { I18nProps as Props } from '@polkadot/ui-app/types';
 import { KeyringPair } from '@polkadot/keyring/types';
 
 import React from 'react';
-import { Button , Input, InputAddress, Output, Static } from '@polkadot/ui-app/index';
+import { Button , Input, InputAddress, Output, Static } from '@polkadot/ui-app';
 import keyring from '@polkadot/ui-keyring';
 import { hexToU8a, isHex, stringToU8a, u8aToHex } from '@polkadot/util';
 

packages/app-toolbox/src/Unlock.tsx

@@ -7,7 +7,7 @@ import { KeyringPair } from '@polkadot/keyring/types';
 
 import React from 'react';
 import { Trans } from 'react-i18next';
-import { Button, IdentityIcon, Modal, Password } from '@polkadot/ui-app/index';
+import { Button, IdentityIcon, Modal, Password } from '@polkadot/ui-app';
 
 import translate from './translate';
 

packages/app-toolbox/src/Verify.tsx

@@ -5,7 +5,7 @@
 import { I18nProps as Props } from '@polkadot/ui-app/types';
 
 import React from 'react';
-import { Icon, Input, InputAddress, Static } from '@polkadot/ui-app/index';
+import { Icon, Input, InputAddress, Static } from '@polkadot/ui-app';
 import keyring from '@polkadot/ui-keyring';
 import { hexToU8a, isHex, stringToU8a } from '@polkadot/util';
 import { naclVerify } from '@polkadot/util-crypto';

packages/app-toolbox/src/index.tsx

@@ -11,7 +11,7 @@ import React from 'react';
 import { Route, Switch } from 'react-router';
 import Tabs, { TabItem } from '@polkadot/ui-app/Tabs';
 import accountObservable from '@polkadot/ui-keyring/observable/accounts';
-import { withMulti, withObservable } from '@polkadot/ui-api/index';
+import { withMulti, withObservable } from '@polkadot/ui-api';
 
 import Hash from './Hash';
 import Rpc from './Rpc';

packages/app-transfer/src/Submit.tsx

@@ -9,7 +9,7 @@ import { QueueTx$Extrinsic, QueueTx$ExtrinsicAdd } from '@polkadot/ui-app/Status
 import React from 'react';
 import { Index } from '@polkadot/types';
 import Button from '@polkadot/ui-app/Button';
-import { withCall, withMulti } from '@polkadot/ui-api/index';
+import { withCall, withMulti } from '@polkadot/ui-api';
 
 import translate from './translate';
 

packages/app-transfer/src/Transfer.tsx

@@ -9,8 +9,8 @@ import { ApiProps } from '@polkadot/ui-api/types';
 import BN from 'bn.js';
 import React from 'react';
 import { IExtrinsic } from '@polkadot/types/types';
-import { AddressSummary, InputAddress, InputBalance } from '@polkadot/ui-app/index';
-import { withApi, withMulti } from '@polkadot/ui-api/index';
+import { AddressSummary, InputAddress, InputBalance } from '@polkadot/ui-app';
+import { withApi, withMulti } from '@polkadot/ui-api';
 import { QueueConsumer } from '@polkadot/ui-app/Status/Context';
 import keyring from '@polkadot/ui-keyring';
 import Checks from '@polkadot/ui-signer/Checks';

packages/app-transfer/src/index.tsx

@@ -5,7 +5,7 @@
 import { AppProps, I18nProps } from '@polkadot/ui-app/types';
 
 import React from 'react';
-import { Tabs } from '@polkadot/ui-app/index';
+import { Tabs } from '@polkadot/ui-app';
 
 import './index.css';
 

packages/apps/package.json

@@ -14,7 +14,7 @@
   "dependencies": {
     "@babel/runtime": "^7.3.4",
     "@polkadot/ui-app": "^0.24.42",
-    "@polkadot/ui-assets": "^0.28.8",
+    "@polkadot/ui-assets": "^0.29.2",
     "@polkadot/ui-signer": "^0.24.42",
     "@types/react-tooltip": "^3.9.1",
     "react-tooltip": "^3.9.2"

packages/apps/src/Apps.tsx

@@ -8,7 +8,7 @@ import React from 'react';
 import store from 'store';
 import styled from 'styled-components';
 import { classes } from '@polkadot/ui-app/util';
-import Signer from '@polkadot/ui-signer/index';
+import Signer from '@polkadot/ui-signer';
 import settings from '@polkadot/ui-settings';
 
 import { hot } from 'react-hot-loader/root';

packages/apps/src/Connecting.tsx

@@ -7,7 +7,7 @@ import { ApiProps } from '@polkadot/ui-api/types';
 
 import React from 'react';
 import styled from 'styled-components';
-import { withApi, withMulti } from '@polkadot/ui-api/index';
+import { withApi, withMulti } from '@polkadot/ui-api';
 import settings from '@polkadot/ui-settings';
 
 import translate from './translate';

packages/apps/src/Content/Status.tsx

@@ -9,8 +9,8 @@ import { I18nProps } from '@polkadot/ui-app/types';
 import React from 'react';
 import keyringOption from '@polkadot/ui-keyring/options';
 import { EventRecord } from '@polkadot/types';
-import { Status as StatusDisplay } from '@polkadot/ui-app/index';
-import { withCall, withMulti, withObservable } from '@polkadot/ui-api/index';
+import { Status as StatusDisplay } from '@polkadot/ui-app';
+import { withCall, withMulti, withObservable } from '@polkadot/ui-api';
 import { stringToU8a } from '@polkadot/util';
 import { xxhashAsHex } from '@polkadot/util-crypto';
 

packages/apps/src/Content/index.tsx

@@ -10,7 +10,7 @@ import { RouteProps } from '../types';
 import React from 'react';
 import { withRouter } from 'react-router';
 import styled from 'styled-components';
-import { withCalls, withMulti } from '@polkadot/ui-api/index';
+import { withCalls, withMulti } from '@polkadot/ui-api';
 import { QueueConsumer } from '@polkadot/ui-app/Status/Context';
 
 import Status from './Status';

packages/apps/src/SideBar/Item.tsx

@@ -10,9 +10,9 @@ import { Route } from '../types';
 import React from 'react';
 import { withRouter } from 'react-router';
 import { NavLink } from 'react-router-dom';
-import { Icon, Menu } from '@polkadot/ui-app/index';
+import { Icon, Menu } from '@polkadot/ui-app';
 import accountObservable from '@polkadot/ui-keyring/observable/accounts';
-import { withApi, withMulti, withObservable } from '@polkadot/ui-api/index';
+import { withApi, withMulti, withObservable } from '@polkadot/ui-api';
 import { isFunction } from '@polkadot/util';
 
 import ReactTooltip from 'react-tooltip';

packages/apps/src/SideBar/NodeInfo.tsx

@@ -8,7 +8,7 @@ import { BareProps } from '@polkadot/ui-app/types';
 import React from 'react';
 import styled from 'styled-components';
 import { withApi } from '@polkadot/ui-api/with';
-import { BestNumber, Chain, NodeName, NodeVersion } from '@polkadot/ui-reactive/index';
+import { BestNumber, Chain, NodeName, NodeVersion } from '@polkadot/ui-reactive';
 
 type Props = ApiProps & BareProps & {};
 

packages/apps/src/SideBar/index.tsx

@@ -9,8 +9,8 @@ import './SideBar.css';
 import React from 'react';
 import { withRouter } from 'react-router';
 
-import { withMulti } from '@polkadot/ui-api/index';
-import { Button, Icon, Menu } from '@polkadot/ui-app/index';
+import { withMulti } from '@polkadot/ui-api';
+import { Button, Icon, Menu } from '@polkadot/ui-app';
 
 import routing from '../routing';
 import translate from '../translate';

packages/apps/src/TopBar.tsx

@@ -7,7 +7,7 @@
 import React from 'react';
 import styled from 'styled-components';
 
-import { BestNumber, Chain, NodeName, NodeVersion } from '@polkadot/ui-reactive/index';
+import { BestNumber, Chain, NodeName, NodeVersion } from '@polkadot/ui-reactive';
 
 type Props = {};
 

packages/apps/src/index.tsx

@@ -11,7 +11,7 @@ import ReactDOM from 'react-dom';
 import { HashRouter } from 'react-router-dom';
 import store from 'store';
 import { getTypeRegistry } from '@polkadot/types';
-import { Api } from '@polkadot/ui-api/index';
+import { Api } from '@polkadot/ui-api';
 
 import { QueueConsumer } from '@polkadot/ui-app//Status/Context';
 import Queue from '@polkadot/ui-app/Status/Queue';

packages/apps/src/routing/123code.ts

@@ -4,7 +4,7 @@
 
 import { Routes } from '../types';
 
-import Template from '@polkadot/app-123code/index';
+import Template from '@polkadot/app-123code';
 
 export default ([
   {

packages/apps/src/routing/accounts.ts

@@ -4,7 +4,7 @@
 
 import { Routes } from '../types';
 
-import Accounts from '@polkadot/app-accounts/index';
+import Accounts from '@polkadot/app-accounts';
 
 export default ([
   {

packages/apps/src/routing/addresses.ts

@@ -4,7 +4,7 @@
 
 import { Routes } from '../types';
 
-import Addresses from '@polkadot/app-addresses/index';
+import Addresses from '@polkadot/app-addresses';
 
 export default ([
   {

packages/apps/src/routing/democracy.ts

@@ -4,7 +4,7 @@
 
 import { Routes } from '../types';
 
-import Democracy from '@polkadot/app-democracy/index';
+import Democracy from '@polkadot/app-democracy';
 
 export default ([
   {

packages/apps/src/routing/explorer.ts

@@ -4,7 +4,7 @@
 
 import { Routes } from '../types';
 
-import Explorer from '@polkadot/app-explorer/index';
+import Explorer from '@polkadot/app-explorer';
 
 export default ([
   {

packages/apps/src/routing/extrinsics.ts

@@ -4,7 +4,7 @@
 
 import { Routes } from '../types';
 
-import Extrinsics from '@polkadot/app-extrinsics/index';
+import Extrinsics from '@polkadot/app-extrinsics';
 
 export default ([
   {

packages/apps/src/routing/js.ts

@@ -4,7 +4,7 @@
 
 import { Routes } from '../types';
 
-import Js from '@polkadot/app-js/index';
+import Js from '@polkadot/app-js';
 
 export default ([
   {

packages/apps/src/routing/settings.ts

@@ -4,7 +4,7 @@
 
 import { Routes } from '../types';
 
-import Settings from '@polkadot/app-settings/index';
+import Settings from '@polkadot/app-settings';
 
 export default ([
   {

packages/apps/src/routing/staking.ts

@@ -4,7 +4,7 @@
 
 import { Routes } from '../types';
 
-import Staking from '@polkadot/app-staking/index';
+import Staking from '@polkadot/app-staking';
 
 export default ([
   {

packages/apps/src/routing/storage.ts

@@ -4,7 +4,7 @@
 
 import { Routes } from '../types';
 
-import Storage from '@polkadot/app-storage/index';
+import Storage from '@polkadot/app-storage';
 
 export default ([
   {

packages/apps/src/routing/toolbox.ts

@@ -4,7 +4,7 @@
 
 import { Routes } from '../types';
 
-import Toolbox from '@polkadot/app-toolbox/index';
+import Toolbox from '@polkadot/app-toolbox';
 
 export default ([
   {

packages/apps/src/routing/transfer.ts

@@ -4,7 +4,7 @@
 
 import { Routes } from '../types';
 
-import Transfer from '@polkadot/app-transfer/index';
+import Transfer from '@polkadot/app-transfer';
 
 export default ([
   {

packages/ui-api/package.json

@@ -31,8 +31,8 @@
   "homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme",
   "dependencies": {
     "@babel/runtime": "^7.3.4",
-    "@polkadot/api": "^0.46.10",
-    "@polkadot/ui-util": "^0.28.8",
+    "@polkadot/api": "^0.46.12",
+    "@polkadot/ui-util": "^0.29.2",
     "rxjs-compat": "^6.3.2"
   }
 }

packages/ui-api/src/with/call.tsx

@@ -8,7 +8,7 @@ import { Options } from './types';
 import React from 'react';
 import { assert, isNull, isUndefined } from '@polkadot/util';
 
-import { isEqual, triggerChange } from '../util/index';
+import { isEqual, triggerChange } from '../util';
 import echoTransform from '../transform/echo';
 import withApi from './api';
 

packages/ui-api/src/with/observable.tsx

@@ -12,7 +12,7 @@ import { Observable, of } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 
 import echoTransform from '../transform/echo';
-import { intervalObservable, isEqual, triggerChange } from '../util/index';
+import { intervalObservable, isEqual, triggerChange } from '../util';
 
 type State = CallState & {
   subscriptions: Array<any>; // FIXME subscriptions