+2 −2

trackerActions.js → blockingActions.js

...oid/actions/{trackerActions.js → blockingActions.js}

+1 −1

handler.js

app/panel-android/actions/handler.js

+3 −0

settingsActions.js

app/panel-android/actions/settingsActions.js

+4 −3

PanelAndroid.jsx

app/panel-android/components/PanelAndroid.jsx

+3 −0

BlockingCategories.jsx

...el-android/components/content/BlockingCategories.jsx

+4 −1

BlockingCategory.jsx

...anel-android/components/content/BlockingCategory.jsx

+4 −0

BlockingTab.jsx

app/panel-android/components/content/BlockingTab.jsx

+85 −12

BlockingTracker.jsx

...panel-android/components/content/BlockingTracker.jsx

+63 −0

_blocking_tab.scss

app/scss/android/_blocking_tab.scss

+1 −1

PromoModals.js

src/classes/PromoModals.js