fix(macModal): Fixed not able to close with escape key
test(macModal): Cleaned up unused service