Revert "merge pull"

This reverts commit fc0698f967d6e2815b524f84165edd131a5345dc, reversing
changes made to 9bc1bf8a8a9a5a287078e024e43ecfcfed414de7.
Revert "Revert "merge pull""

This reverts commit 951b33a558652e867c0ee405b840201ccfc08c5e.
share modal working