[DDW-197] Merge and FIX conflicts

input-output-hk · Nov 24, 2020 · ccd0723 · ccd0723
2 parents 1c408ca + 4bc02ae
commit ccd0723
Show file tree

Hide file tree

Showing 75 changed files with 1,628 additions and 1,694 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,10 +15,15 @@ Changelog
 
 ### Chores
 
+- Implemented Smart Tooltips across whole application ([PR 2243](https://github.com/input-output-hk/daedalus/pull/2243))
 - Updated `cardano-wallet` to version `2020-11-17` ([PR 2246](https://github.com/input-output-hk/daedalus/pull/2246))
 - Implemented a tool for quickly copying css properties on theme files ([PR 2196](https://github.com/input-output-hk/daedalus/pull/2196))
 - Hid hardware wallet restoration support ([PR 2237](https://github.com/input-output-hk/daedalus/pull/2237))
 
+### Fixes
+
+- Fixed Newsfeed drop shadow when there is an update item ([PR 2242](https://github.com/input-output-hk/daedalus/pull/2242))
+
 ## 2.4.1
 
 ### Fixes

diff --git a/installers/common/MacInstaller.hs b/installers/common/MacInstaller.hs
@@ -167,6 +167,8 @@ codeSignEntitlements = [r|<?xml version="1.0" encoding="UTF-8"?>
   <dict>
     <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
     <true/>
+    <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+    <true/>
   </dict>
 </plist>|]
 

diff --git a/package.json b/package.json
@@ -227,7 +227,7 @@
     "react-intl": "2.7.2",
     "react-lottie": "1.2.3",
     "react-markdown": "4.3.1",
-    "react-polymorph": "0.9.7-rc.5",
+    "react-polymorph": "0.9.7-rc.6",
     "react-router": "5.2.0",
     "react-router-dom": "5.2.0",
     "react-svg-inline": "2.1.1",