2 files changed, 17 insertions, 17 deletions

diff --git a/src/pages/confirm-contract.tsx b/src/pages/confirm-contract.tsx
index 2beac08f6..238ae2fb5 100644
--- a/src/pages/confirm-contract.tsx
+++ b/src/pages/confirm-contract.tsx
@@ -24,8 +24,8 @@
 "use strict";
 
 import {substituteFulfillmentUrl} from "src/helpers";
-import {Contract, AmountJson, IExchangeInfo} from "src/types";
-import {Offer} from "src/wallet";
+import {Contract, AmountJson, ExchangeRecord} from "src/types";
+import {OfferRecord} from "src/wallet";
 import {renderContract, prettyAmount} from "src/renderHtml";
 import {getExchanges} from "src/wxApi";
 
@@ -37,7 +37,7 @@ interface DetailState {
 interface DetailProps {
   contract: Contract
   collapsed: boolean
-  exchanges: null|IExchangeInfo[];
+  exchanges: null|ExchangeRecord[];
 }
 
 
@@ -78,7 +78,7 @@ class Details extends React.Component<DetailProps, DetailState> {
             Exchanges in the wallet:
             <ul>
               {(this.props.exchanges || []).map(
-                (e: IExchangeInfo) =>
+                (e: ExchangeRecord) =>
                   <li>{`${e.baseUrl}: ${e.masterPublicKey}`}</li>)}
             </ul>
           </div>
@@ -92,10 +92,10 @@ interface ContractPromptProps {
 }
 
 interface ContractPromptState {
-  offer: Offer|null;
+  offer: OfferRecord|null;
   error: string|null;
   payDisabled: boolean;
-  exchanges: null|IExchangeInfo[];
+  exchanges: null|ExchangeRecord[];
 }
 
 class ContractPrompt extends React.Component<ContractPromptProps, ContractPromptState> {
@@ -125,7 +125,7 @@ class ContractPrompt extends React.Component<ContractPromptProps, ContractPrompt
     this.setState({exchanges} as any);
   }
 
-  getOffer(): Promise<Offer> {
+  getOffer(): Promise<OfferRecord> {
     return new Promise((resolve, reject) => {
       let msg = {
         type: 'get-offer',
diff --git a/src/pages/tree.tsx b/src/pages/tree.tsx
index e368ffe9b..daabdaf49 100644
--- a/src/pages/tree.tsx
+++ b/src/pages/tree.tsx
@@ -21,8 +21,8 @@
  */
 
 
-import { IExchangeInfo } from "src/types";
-import { ReserveRecord, Coin, PreCoin, Denomination } from "src/types";
+import { ExchangeRecord } from "src/types";
+import { ReserveRecord, CoinRecord, PreCoinRecord, Denomination } from "src/types";
 import { ImplicitStateComponent, StateHolder } from "src/components";
 import {
   getReserves, getExchanges, getCoins, getPreCoins,
@@ -87,11 +87,11 @@ class Toggle extends ImplicitStateComponent<ToggleProps> {
 
 
 interface CoinViewProps {
-  coin: Coin;
+  coin: CoinRecord;
 }
 
 interface RefreshDialogProps {
-  coin: Coin;
+  coin: CoinRecord;
 }
 
 class RefreshDialog extends ImplicitStateComponent<RefreshDialogProps> {
@@ -134,7 +134,7 @@ class CoinView extends React.Component<CoinViewProps, void> {
 
 
 interface PreCoinViewProps {
-  precoin: PreCoin;
+  precoin: PreCoinRecord;
 }
 
 class PreCoinView extends React.Component<PreCoinViewProps, void> {
@@ -155,7 +155,7 @@ interface CoinListProps {
 }
 
 class CoinList extends ImplicitStateComponent<CoinListProps> {
-  coins = this.makeState<Coin[] | null>(null);
+  coins = this.makeState<CoinRecord[] | null>(null);
   expanded = this.makeState<boolean>(false);
 
   constructor(props: CoinListProps) {
@@ -194,7 +194,7 @@ interface PreCoinListProps {
 }
 
 class PreCoinList extends ImplicitStateComponent<PreCoinListProps> {
-  precoins = this.makeState<PreCoin[] | null>(null);
+  precoins = this.makeState<PreCoinRecord[] | null>(null);
   expanded = this.makeState<boolean>(false);
 
   constructor(props: PreCoinListProps) {
@@ -224,7 +224,7 @@ class PreCoinList extends ImplicitStateComponent<PreCoinListProps> {
 }
 
 interface DenominationListProps {
-  exchange: IExchangeInfo;
+  exchange: ExchangeRecord;
 }
 
 interface ExpanderTextProps {
@@ -336,7 +336,7 @@ class ReserveList extends ImplicitStateComponent<ReserveListProps> {
 }
 
 interface ExchangeProps {
-  exchange: IExchangeInfo;
+  exchange: ExchangeRecord;
 }
 
 class ExchangeView extends React.Component<ExchangeProps, void> {
@@ -358,7 +358,7 @@ class ExchangeView extends React.Component<ExchangeProps, void> {
 }
 
 interface ExchangesListState {
-  exchanges?: IExchangeInfo[];
+  exchanges?: ExchangeRecord[];
 }
 
 class ExchangesList extends React.Component<any, ExchangesListState> {