Misc fixes after rebase

embark-ui/src/actions/index.js

@@ -147,6 +147,14 @@ export const ensRecords = {
   failure: (error) => action(ENS_RECORDS[FAILURE], {error})
 };
 
+
+export const FIDDLE = createRequestTypes('FIDDLE');
+export const fiddle = {
+  request: (codeToCompile) => action(FIDDLE[REQUEST], {codeToCompile}),
+  success: (fiddle) => action(FIDDLE[SUCCESS], {fiddles: [fiddle]}),
+  failure: (error) => action(FIDDLE[FAILURE], {error})
+};
+
 // Web Socket
 export const WATCH_NEW_PROCESS_LOGS = 'WATCH_NEW_PROCESS_LOGS';
 export const WATCH_NEW_CONTRACT_LOGS = 'WATCH_NEW_CONTRACT_LOGS';
@@ -171,11 +179,4 @@ export function initBlockHeader(){
   };
 }
 
-export const FIDDLE = createRequestTypes('FIDDLE');
-export const fiddle = {
-  request: (codeToCompile) => action(FIDDLE[REQUEST], {codeToCompile}),
-  success: (fiddle) => action(FIDDLE[SUCCESS], {fiddle}),
-  failure: (error) => action(FIDDLE[FAILURE], {error})
-};
-
 

embark-ui/src/containers/TransactionsContainer.js

@@ -42,7 +42,7 @@ function mapStateToProps(state) {
 }
 
 TransactionsContainer.propTypes = {
-  transactions: PropTypes.object,
+  transactions: PropTypes.arrayOf(PropTypes.object),
   fetchTransactions: PropTypes.func,
   error: PropTypes.string,
   loading: PropTypes.bool

embark-ui/src/reducers/index.js

@@ -16,7 +16,7 @@ const entitiesDefaultState = {
   commands: [],
   messages: [],
   messageChannels: [],
-  fiddle: null,
+  fiddles: [],
   versions: [],
   plugins: [],
   ensRecords: []

embark-ui/src/reducers/selectors.js

@@ -91,7 +91,7 @@ export function getMessages(state) {
 }
 
 export function getFiddle(state) {
-  return state.entities.fiddle;
+  return state.entities.fiddles[0];
 }
 
 export function getEnsRecords(state) {