Ignore errors for not asked fields.

Telegram/SourceFiles/passport/passport_form_controller.cpp

@@ -831,7 +831,6 @@ void FormController::decryptValues() {
 }
 
 void FormController::fillErrors() {
-	// #TODO passport filter by flags
 	const auto find = [&](const MTPSecureValueType &type) -> Value* {
 		const auto converted = ConvertType(type);
 		const auto i = _form.values.find(ConvertType(type));
@@ -841,18 +840,28 @@ void FormController::fillErrors() {
 		LOG(("API Error: Value not found for error type."));
 		return nullptr;
 	};
-	const auto scan = [&](Value &value, bytes::const_span hash) -> File* {
+	using List = std::vector<File>;
-		const auto i = ranges::find_if(value.scans, [&](const File &scan) {
+	const auto findScan = [&](List &list, bytes::const_span hash) -> File* {
+		const auto i = ranges::find_if(list, [&](const File &scan) {
 			return !bytes::compare(hash, scan.hash);
 		});
-		if (i != end(value.scans)) {
+		if (i != end(list)) {
 			return &*i;
 		}
+		return nullptr;
+	};
+	const auto scan = [&](Value &value, bytes::const_span hash) -> File* {
+		if (const auto translation = findScan(value.translations, hash)) {
+			return translation;
+		} else if (const auto scan = findScan(value.scans, hash)) {
+			return scan;
+		}
 		LOG(("API Error: File not found for error value."));
 		return nullptr;
 	};
 	const auto setSpecialScanError = [&](SpecialFile type, auto &&data) {
 		if (const auto value = find(data.vtype)) {
+			if (value->requiresSpecialScan(type)) {
 				const auto i = value->specialScans.find(type);
 				if (i != value->specialScans.end()) {
 					i->second.error = qs(data.vtext);
@@ -862,6 +871,7 @@ void FormController::fillErrors() {
 						).arg(int(type)));
 				}
 			}
+		}
 	};
 	for (const auto &error : _form.pendingErrors) {
 		error.match([&](const MTPDsecureValueError &data) {
@@ -871,8 +881,10 @@ void FormController::fillErrors() {
 		}, [&](const MTPDsecureValueErrorData &data) {
 			if (const auto value = find(data.vtype)) {
 				const auto key = qs(data.vfield);
+				if (!SkipFieldCheck(value, key)) {
 					value->data.parsed.fields[key].error = qs(data.vtext);
 				}
+			}
 		}, [&](const MTPDsecureValueErrorFile &data) {
 			const auto hash = bytes::make_span(data.vfile_hash.v);
 			if (const auto value = find(data.vtype)) {
@@ -887,14 +899,18 @@ void FormController::fillErrors() {
 		}, [&](const MTPDsecureValueErrorTranslationFile &data) {
 			const auto hash = bytes::make_span(data.vfile_hash.v);
 			if (const auto value = find(data.vtype)) {
-				if (const auto file = scan(*value, hash)) { // #TODO passport
+				if (value->translationRequired) {
+					if (const auto file = scan(*value, hash)) {
 						file->error = qs(data.vtext);
 					}
 				}
+			}
 		}, [&](const MTPDsecureValueErrorTranslationFiles &data) {
 			if (const auto value = find(data.vtype)) {
+				if (value->translationRequired) {
 					value->translationMissingError = qs(data.vtext);
 				}
+			}
 		}, [&](const MTPDsecureValueErrorFrontSide &data) {
 			setSpecialScanError(SpecialFile::FrontSide, data);
 		}, [&](const MTPDsecureValueErrorReverseSide &data) {

Telegram/SourceFiles/passport/passport_panel_controller.cpp

@@ -324,6 +324,34 @@ EditContactScheme GetContactScheme(Scope::Type type) {
 	Unexpected("Type in GetContactScheme().");
 }
 
+const std::map<QString, QString> &NativeNameKeys() {
+	static const auto result = std::map<QString, QString> {
+		{ qsl("first_name"), qsl("first_name_native") },
+		{ qsl("last_name"), qsl("last_name_native") },
+		{ qsl("middle_name"), qsl("middle_name_native") },
+	};
+	return result;
+}
+
+const std::map<QString, QString> &LatinNameKeys() {
+	static const auto result = std::map<QString, QString> {
+		{ qsl("first_name_native"), qsl("first_name") },
+		{ qsl("last_name_native"), qsl("last_name") },
+		{ qsl("_nativemiddle_name"), qsl("middle_name") },
+	};
+	return result;
+}
+
+bool SkipFieldCheck(not_null<const Value*> value, const QString &key) {
+	if (value->type != Value::Type::PersonalDetails) {
+		return false;
+	}
+	const auto &namesMap = value->nativeNames
+		? NativeNameKeys()
+		: LatinNameKeys();
+	return namesMap.find(key) == end(namesMap);
+}
+
 BoxPointer::BoxPointer(QPointer<BoxContent> value)
 : _value(value) {
 }
@@ -636,15 +664,19 @@ ScanInfo PanelController::collectScanInfo(const EditFile &file) const {
 
 std::vector<ScopeError> PanelController::collectErrors(
 		not_null<const Value*> value) const {
+	using General = ScopeError::General;
+
 	auto result = std::vector<ScopeError>();
 	if (!value->error.isEmpty()) {
-		result.push_back({ FileKey(), value->error });
+		result.push_back({ General::WholeValue, value->error });
 	}
 	if (!value->scanMissingError.isEmpty()) {
-		result.push_back({ FileKey(), value->scanMissingError });
+		result.push_back({ General::ScanMissing, value->scanMissingError });
 	}
 	if (!value->translationMissingError.isEmpty()) {
-		result.push_back({ FileKey(), value->translationMissingError });
+		result.push_back({
+			General::TranslationMissing,
+			value->translationMissingError });
 	}
 	const auto addFileError = [&](const EditFile &file) {
 		if (!file.fields.error.isEmpty()) {

Telegram/SourceFiles/passport/passport_panel_controller.h

@@ -25,6 +25,10 @@ EditDocumentScheme GetDocumentScheme(
 	base::optional<Value::Type> scansType = base::none);
 EditContactScheme GetContactScheme(Scope::Type type);
 
+const std::map<QString, QString> &NativeNameKeys();
+const std::map<QString, QString> &LatinNameKeys();
+bool SkipFieldCheck(not_null<const Value*> value, const QString &key);
+
 struct ScanInfo {
 	FileKey key;
 	QString status;
@@ -36,12 +40,17 @@ struct ScanInfo {
 };
 
 struct ScopeError {
-	// FileKey:id != 0 - file_hash error (bad scan / selfie)
+	enum class General {
-	// FileKey:id == 0 - vector<file_hash> error (scan missing)
+		WholeValue,
-	// QString - data_hash with such key error (bad value)
+		ScanMissing,
-	base::variant<FileKey, QString> key;
+		TranslationMissing,
-	QString text;
+	};
 
+	// FileKey - file_hash error (bad scan / selfie / translation)
+	// General - general value error (or scan / translation missing)
+	// QString - data_hash with such key error (bad value)
+	base::variant<FileKey, General, QString> key;
+	QString text;
 };
 
 class BoxPointer {