Fixing smoke as per changes of add non full supply functionaloty on create RnR screen