Merge pull request #6349 from gabbyprecious/unlock-error-message#2529

change changepassword and unlock error message

cmd/lncli/commands.go

@@ -101,7 +101,10 @@ func actionDecorator(f func(*cli.Context) error) func(*cli.Context) error {
 			// two commands.
 			if s.Code() == codes.Unimplemented &&
 				(c.Command.Name == "create" ||
-					c.Command.Name == "unlock") {
+					c.Command.Name == "unlock" || 
+					c.Command.Name == "changepassword" ||
+					c.Command.Name == "createwatchonly") {
+					
 				return fmt.Errorf("Wallet is already unlocked")
 			}