The development includes 422 townhouses, colonies and apartments, with 27 electric car charging points, 154 car parking spaces and 320 cycle spaces.
The self-contained ground floor studio commercial units will range from 500-900 sq ft, with retail, office and studio planning consent in place.
They are expected to be available from early 2020.
Cameron Whyte of sales agent Ryden said: “We are delighted to work with CALA Homes to market the commercial units within Waterfront Plaza. The scale of the residential element will significantly enhance Leith’s Shore area and given the lack of commercial stock available to purchase we expect the units to be well received.”
Nearby Ocean Terminal is due to undergo a revamp and the area will benefit from the extension of the Edinburgh tram line to Leith.
Craig Lynes, land director with CALA Homes (East), said: “From the beginning, the aim of this development was to regenerate Leith’s famous waterfront and bring new life to the disused and derelict site.
"We firmly believe that the creation of these commercial units helps to fulfil the potential of this area and with exciting developments in transport and revamped local amenities, we believe this will be a very attractive spot for businesses..."