fix merge conflicts

1 files changed, 18 insertions, 3 deletions

diff --git a/ui/app/components/currency-display/tests/currency-display.container.test.js b/ui/app/components/currency-display/tests/currency-display.container.test.js
index 5265bbb04..b9f98c543 100644
--- a/ui/app/components/currency-display/tests/currency-display.container.test.js
+++ b/ui/app/components/currency-display/tests/currency-display.container.test.js
@@ -1,12 +1,13 @@
 import assert from 'assert'
 import proxyquire from 'proxyquire'
 
-let mapStateToProps
+let mapStateToProps, mergeProps
 
 proxyquire('../currency-display.container.js', {
   'react-redux': {
-    connect: ms => {
+    connect: (ms, md, mp) => {
       mapStateToProps = ms
+      mergeProps = mp
       return () => ({})
     },
   },
@@ -22,6 +23,20 @@ describe('CurrencyDisplay container', () => {
         },
       }
 
+      assert.deepEqual(mapStateToProps(mockState), {
+        conversionRate: 280.45,
+        currentCurrency: 'usd',
+      })
+    })
+  })
+
+  describe('mergeProps()', () => {
+    it('should return the correct props', () => {
+      const mockStateProps = {
+        conversionRate: 280.45,
+        currentCurrency: 'usd',
+      }
+
       const tests = [
         {
           props: {
@@ -98,7 +113,7 @@ describe('CurrencyDisplay container', () => {
       ]
 
       tests.forEach(({ props, result }) => {
-        assert.deepEqual(mapStateToProps(mockState, props), result)
+        assert.deepEqual(mergeProps(mockStateProps, {}, { ...props }), result)
       })
     })
   })