fix: improve actions waiting timeout based on data (#488)

fix: improve actions waiting timeout based on data (#488) #136