refactor(commons): adapt for commons-ui