Removed Circular Dependencies

js/src/api/format/input.js

@@ -17,7 +17,7 @@
 import BigNumber from 'bignumber.js';
 
 import { isArray, isHex, isInstanceOf, isString } from '../util/types';
-import { padLeft } from '../util/format';
+import { padLeft, toHex } from '../util/format';
 
 export function inAddress (address) {
   // TODO: address validation if we have upper-lower addresses
@@ -100,15 +100,7 @@ export function inFilter (options) {
 }
 
 export function inHex (str) {
-  if (str && str.toString) {
+  return toHex(str);
-    str = str.toString(16);
-  }
-
-  if (str && str.substr(0, 2) === '0x') {
-    return str.toLowerCase();
-  }
-
-  return `0x${(str || '').toLowerCase()}`;
 }
 
 export function inNumber10 (number) {

js/src/api/util/format.js

@@ -15,7 +15,6 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 import { range } from 'lodash';
-import { inHex } from '../format/input';
 
 export function bytesToHex (bytes) {
   return '0x' + bytes.map((b) => ('0' + b.toString(16)).slice(-2)).join('');
@@ -38,11 +37,23 @@ export function asciiToHex (string) {
 }
 
 export function padRight (input, length) {
-  const value = inHex(input).substr(2, length * 2);
+  const value = toHex(input).substr(2, length * 2);
   return '0x' + value + range(length * 2 - value.length).map(() => '0').join('');
 }
 
 export function padLeft (input, length) {
-  const value = inHex(input).substr(2, length * 2);
+  const value = toHex(input).substr(2, length * 2);
   return '0x' + range(length * 2 - value.length).map(() => '0').join('') + value;
 }
+
+export function toHex (str) {
+  if (str && str.toString) {
+    str = str.toString(16);
+  }
+
+  if (str && str.substr(0, 2) === '0x') {
+    return str.toLowerCase();
+  }
+
+  return `0x${(str || '').toLowerCase()}`;
+}

js/src/ui/Actionbar/Export/export.js

@@ -19,7 +19,7 @@ import React, { Component, PropTypes } from 'react';
 import FileSaver from 'file-saver';
 import FileDownloadIcon from 'material-ui/svg-icons/file/file-download';
 
-import { Button } from '../../';
+import Button from '../../Button';
 
 class ActionbarExport extends Component {
   static propTypes = {

js/src/ui/Actionbar/Import/import.js

@@ -20,7 +20,8 @@ import FileUploadIcon from 'material-ui/svg-icons/file/file-upload';
 import ContentClear from 'material-ui/svg-icons/content/clear';
 import ActionDoneAll from 'material-ui/svg-icons/action/done-all';
 
-import { Modal, Button } from '../../';
+import Button from '../../Button';
+import Modal from '../../Modal';
 
 import styles from './import.css';
 

js/src/ui/Actionbar/Search/search.js

@@ -17,7 +17,8 @@
 import React, { Component, PropTypes } from 'react';
 import ActionSearch from 'material-ui/svg-icons/action/search';
 
-import { Button, InputChip } from '../../';
+import Button from '../../Button';
+import InputChip from '../../Form/InputChip';
 
 import styles from './search.css';
 

js/src/ui/Actionbar/Sort/sort.js

@@ -22,7 +22,7 @@ import MenuItem from 'material-ui/MenuItem';
 
 import SortIcon from 'material-ui/svg-icons/content/sort';
 
-import { Button } from '../../';
+import Button from '../../Button';
 
 import SortStore from './sortStore';
 import styles from './sort.css';

js/src/ui/Form/TypedInput/typedInput.js

@@ -22,7 +22,10 @@ import IconButton from 'material-ui/IconButton';
 import AddIcon from 'material-ui/svg-icons/content/add';
 import RemoveIcon from 'material-ui/svg-icons/content/remove';
 
-import { Input, InputAddressSelect, Select } from '../../../ui';
+import Input from '../../../ui/Form/Input';
+import InputAddressSelect from '../../../ui/Form/InputAddressSelect';
+import Select from '../../../ui/Form/Select';
+
 import { ABI_TYPES } from '../../../util/abi';
 
 import styles from './typedInput.css';