feat: [TEA-18] pick fixes from the upstream MR #62

bydawen wants to merge 1 commit intoteak-rgraccoongang/frontend-app-learning:teak-rgfrom

buhaienko/tokens/TEA-18raccoongang/frontend-app-learning:buhaienko/tokens/TEA-18Copy head branch name to clipboard