proszę o sprawdzenie

prosze o sprawdzenie poprawności zdań;
1.When you will be at florist's you can smell wonderful scent of freshly cut flowers.
2.When I passed the bakery I could smell mouth-watering aroma of freshly baked bread.

1.When you are at...
2. When I was passing by the bakery...