There could be riots because the jobs that will get replaced first are not basic needs. If we can drive food production, mineral extraction costs to zero through automation first we can have some semblance of good life for all. You can't automate jobs at the top and then expect more for all. If you want more produce more.

(1) Nationalise and/or fully automate agriculture and mining.

(2) Automate transport fully. You don't need fsd perfection if all vehicles are automated and can sense each other.

(3) Automate construction of homes and cities.

(4) Drive down cost of energy via fusion or slowly increase capacity through robot labour.

Provide the basics for free for everyone. Food, water, shelter, internet and some extra UBI. The odds of riots decrease greatly.