From 58dabbf1880f24c8dc47f9564e3d76d4aaa7fd7a Mon Sep 17 00:00:00 2001
From: man-y <man-y@yandex-team.com>
Date: Thu, 21 Nov 2024 15:23:20 +0300
Subject: [PATCH] Fix unsafe map of backgrounds
 commit_hash:84c7e5815af1f873cfc1a4cd6ea8b32b956547dc

---
 client/flutter/divkit/CHANGELOG.md            |   3 +-
 .../flutter/divkit/example/ios/Podfile.lock   |  48 +---
 .../ios/Runner.xcodeproj/project.pbxproj      |   2 +-
 .../xcshareddata/xcschemes/Runner.xcscheme    |   2 +-
 client/flutter/divkit/example/pubspec.lock    | 232 +++++++++---------
 .../src/core/converters/base_specific.dart    |  30 +--
 .../core/widgets/text/div_text_widget.dart    |   4 +-
 client/flutter/divkit/pubspec.yaml            |   2 +-
 client/flutter/divkit/tool/validate.sh        |   2 +-
 9 files changed, 143 insertions(+), 182 deletions(-)

diff --git a/client/flutter/divkit/CHANGELOG.md b/client/flutter/divkit/CHANGELOG.md
index 54b0523f6..ba2047030 100644
--- a/client/flutter/divkit/CHANGELOG.md
+++ b/client/flutter/divkit/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 0.6.0-rc.1
+## 0.6.0-rc.2
 
 * Update generated schema
 * Support nullable end in div-ranges and cloud background fallback
@@ -8,6 +8,7 @@
 * Rewrite context initialization mechanism to synchronous
 * Rewrite conversion mechanism, simplify and standardize
 * Rewrite expression analyzer to synchronous
+* Fix unsafe map of backgrounds
 
 ## Migration 0.5.0 → 0.6.0
 * Remove DivKitView property `cacheManager` as unsupported to the proper extent
diff --git a/client/flutter/divkit/example/ios/Podfile.lock b/client/flutter/divkit/example/ios/Podfile.lock
index bab78241b..2b4ea9dd8 100644
--- a/client/flutter/divkit/example/ios/Podfile.lock
+++ b/client/flutter/divkit/example/ios/Podfile.lock
@@ -1,15 +1,4 @@
 PODS:
-  - DivKit (30.14.0):
-    - DivKit_LayoutKit (= 30.14.0)
-    - DivKit_Serialization (= 30.14.0)
-    - VGSL (~> 6.0)
-  - DivKit_LayoutKit (30.14.0):
-    - DivKit_LayoutKitInterface (= 30.14.0)
-    - VGSL (~> 6.0)
-  - DivKit_LayoutKitInterface (30.14.0):
-    - VGSL (~> 6.0)
-  - DivKit_Serialization (30.14.0):
-    - VGSL (~> 6.0)
   - Flutter (1.0.0)
   - FMDB (2.7.12):
     - FMDB/standard (= 2.7.12)
@@ -22,57 +11,30 @@ PODS:
   - sqflite (0.0.2):
     - Flutter
     - FMDB (>= 2.7.5)
-  - VGSL (6.4.0):
-    - VGSLFundamentals (= 6.4.0)
-    - VGSLNetworking (= 6.4.0)
-    - VGSLUI (= 6.4.0)
-  - VGSLFundamentals (6.4.0)
-  - VGSLNetworking (6.4.0):
-    - VGSLFundamentals (= 6.4.0)
-    - VGSLUI (= 6.4.0)
-  - VGSLUI (6.4.0):
-    - VGSLFundamentals (= 6.4.0)
 
 DEPENDENCIES:
-  - DivKit (~> 30.0)
   - Flutter (from `Flutter`)
-  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`)
+  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - sqflite (from `.symlinks/plugins/sqflite/ios`)
 
 SPEC REPOS:
   trunk:
-    - DivKit
-    - DivKit_LayoutKit
-    - DivKit_LayoutKitInterface
-    - DivKit_Serialization
     - FMDB
-    - VGSL
-    - VGSLFundamentals
-    - VGSLNetworking
-    - VGSLUI
 
 EXTERNAL SOURCES:
   Flutter:
     :path: Flutter
   path_provider_foundation:
-    :path: ".symlinks/plugins/path_provider_foundation/ios"
+    :path: ".symlinks/plugins/path_provider_foundation/darwin"
   sqflite:
     :path: ".symlinks/plugins/sqflite/ios"
 
 SPEC CHECKSUMS:
-  DivKit: cc64dacca7e17969ee8807b85f8f13750c2c2513
-  DivKit_LayoutKit: 5ff58184d402a70bf2d7de52e90576115871b5e5
-  DivKit_LayoutKitInterface: 43ba8a2bd5693439e93474875ecefbea8f6fba79
-  DivKit_Serialization: 46290b7e09f53bf398663b145d6caa74b2612281
-  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   FMDB: 728731dd336af3936ce00f91d9d8495f5718a0e6
-  path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
+  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   sqflite: f7868cb717a559a515967bb4033af73521c7d3f4
-  VGSL: 14a67feafe2e6203546d4557f9259d8c705fcb83
-  VGSLFundamentals: 9cb06c36cb92a72c77b689a6f5c4802dd18eeb7e
-  VGSLNetworking: 0146afd59633755bb3fab997b3a8450f8dcd5f27
-  VGSLUI: a963363d2aa3421658245d7b8951029f674e5427
 
-PODFILE CHECKSUM: 33f8f678415c6e69ec46d17ad643bfeacaa66957
+PODFILE CHECKSUM: bdb6020bee847baa4ad4ac9429c3786eff42bb51
 
 COCOAPODS: 1.15.2
diff --git a/client/flutter/divkit/example/ios/Runner.xcodeproj/project.pbxproj b/client/flutter/divkit/example/ios/Runner.xcodeproj/project.pbxproj
index 452a6ba6b..4ece37e8c 100644
--- a/client/flutter/divkit/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/client/flutter/divkit/example/ios/Runner.xcodeproj/project.pbxproj
@@ -156,7 +156,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
diff --git a/client/flutter/divkit/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/client/flutter/divkit/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index c87d15a33..5e31d3d34 100644
--- a/client/flutter/divkit/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/client/flutter/divkit/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/client/flutter/divkit/example/pubspec.lock b/client/flutter/divkit/example/pubspec.lock
index a2768fe38..559ccad88 100644
--- a/client/flutter/divkit/example/pubspec.lock
+++ b/client/flutter/divkit/example/pubspec.lock
@@ -5,16 +5,16 @@ packages:
     dependency: transitive
     description:
       name: args
-      sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6
-      url: "https://pub.dev"
+      sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
-    version: "2.6.0"
+    version: "2.4.2"
   async:
     dependency: transitive
     description:
       name: async
       sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "2.11.0"
   boolean_selector:
@@ -22,39 +22,39 @@ packages:
     description:
       name: boolean_selector
       sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "2.1.1"
   cached_network_image:
     dependency: transitive
     description:
       name: cached_network_image
-      sha256: "4a5d8d2c728b0f3d0245f69f921d7be90cae4c2fd5288f773088672c0893f819"
-      url: "https://pub.dev"
+      sha256: "805b4d9f3fab442db4886f49aff582f78ed6aa972a68d3fe2ed57d9411f72de3"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
-    version: "3.4.0"
+    version: "3.3.1+yxpatch.1"
   cached_network_image_platform_interface:
     dependency: transitive
     description:
       name: cached_network_image_platform_interface
-      sha256: "35814b016e37fbdc91f7ae18c8caf49ba5c88501813f73ce8a07027a395e2829"
-      url: "https://pub.dev"
+      sha256: "9e90e78ae72caa874a323d78fa6301b3fb8fa7ea76a8f96dc5b5bf79f283bf2f"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
-    version: "4.1.1"
+    version: "4.0.0"
   cached_network_image_web:
     dependency: transitive
     description:
       name: cached_network_image_web
-      sha256: "6322dde7a5ad92202e64df659241104a43db20ed594c41ca18de1014598d7996"
-      url: "https://pub.dev"
+      sha256: "42a835caa27c220d1294311ac409a43361088625a4f23c820b006dd9bffb3316"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
-    version: "1.3.0"
+    version: "1.1.1"
   characters:
     dependency: transitive
     description:
       name: characters
       sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "1.3.0"
   clock:
@@ -62,7 +62,7 @@ packages:
     description:
       name: clock
       sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "1.1.1"
   collection:
@@ -70,7 +70,7 @@ packages:
     description:
       name: collection
       sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "1.18.0"
   crypto:
@@ -78,7 +78,7 @@ packages:
     description:
       name: crypto
       sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "3.0.3"
   divkit:
@@ -87,13 +87,13 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.6.0-rc.1"
+    version: "0.6.0-rc.2"
   equatable:
     dependency: "direct main"
     description:
       name: equatable
       sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "2.0.5"
   fake_async:
@@ -101,33 +101,33 @@ packages:
     description:
       name: fake_async
       sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "1.3.1"
   ffi:
     dependency: transitive
     description:
       name: ffi
-      sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6"
-      url: "https://pub.dev"
+      sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.2"
   file:
     dependency: transitive
     description:
       name: file
-      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
-      url: "https://pub.dev"
+      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
-    version: "7.0.1"
+    version: "7.0.0"
   fixnum:
     dependency: transitive
     description:
       name: fixnum
-      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
-      url: "https://pub.dev"
+      sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -137,34 +137,34 @@ packages:
     dependency: transitive
     description:
       name: flutter_cache_manager
-      sha256: "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386"
-      url: "https://pub.dev"
+      sha256: "8207f27539deb83732fdda03e259349046a39a4c767269285f449ade355d54ba"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
-    version: "3.4.1"
+    version: "3.3.1"
   flutter_lints:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04
-      url: "https://pub.dev"
+      sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.1"
   flutter_riverpod:
     dependency: "direct main"
     description:
       name: flutter_riverpod
-      sha256: "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1"
-      url: "https://pub.dev"
+      sha256: "0c997763ce06359ee4686553b74def84062e9d6929ac63f61fa02465c1f8e32c"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
-    version: "2.6.1"
+    version: "2.1.3"
   flutter_svg:
     dependency: transitive
     description:
       name: flutter_svg
-      sha256: "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2"
-      url: "https://pub.dev"
+      sha256: "0642eefe463f074da744cd0c8b0378e3377e6265967ce635735de329722415da"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
-    version: "2.0.10+1"
+    version: "2.0.10+yxpatch.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -175,7 +175,7 @@ packages:
     description:
       name: http
       sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "1.2.2"
   http_parser:
@@ -183,7 +183,7 @@ packages:
     description:
       name: http_parser
       sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "4.0.2"
   leak_tracker:
@@ -191,7 +191,7 @@ packages:
     description:
       name: leak_tracker
       sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "10.0.0"
   leak_tracker_flutter_testing:
@@ -199,7 +199,7 @@ packages:
     description:
       name: leak_tracker_flutter_testing
       sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "2.0.1"
   leak_tracker_testing:
@@ -207,23 +207,23 @@ packages:
     description:
       name: leak_tracker_testing
       sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "2.0.1"
   lints:
     dependency: transitive
     description:
       name: lints
-      sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
-      url: "https://pub.dev"
+      sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
-    version: "2.1.1"
+    version: "2.0.1"
   logging:
     dependency: transitive
     description:
       name: logging
       sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "1.2.0"
   matcher:
@@ -231,7 +231,7 @@ packages:
     description:
       name: matcher
       sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "0.12.16+1"
   material_color_utilities:
@@ -239,7 +239,7 @@ packages:
     description:
       name: material_color_utilities
       sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "0.8.0"
   meta:
@@ -247,7 +247,7 @@ packages:
     description:
       name: meta
       sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "1.11.0"
   octo_image:
@@ -255,7 +255,7 @@ packages:
     description:
       name: octo_image
       sha256: "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd"
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "2.1.0"
   path:
@@ -263,31 +263,31 @@ packages:
     description:
       name: path
       sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "1.9.0"
   path_parsing:
     dependency: transitive
     description:
       name: path_parsing
-      sha256: "45f7d6bba1128761de5540f39d5ca000ea8a1f22f06b76b61094a60a2997bd0e"
-      url: "https://pub.dev"
+      sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.1"
   path_provider:
     dependency: transitive
     description:
       name: path_provider
-      sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378
-      url: "https://pub.dev"
+      sha256: c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.3"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
       sha256: a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "2.2.4"
   path_provider_foundation:
@@ -295,7 +295,7 @@ packages:
     description:
       name: path_provider_foundation
       sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "2.4.0"
   path_provider_linux:
@@ -303,7 +303,7 @@ packages:
     description:
       name: path_provider_linux
       sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "2.2.1"
   path_provider_platform_interface:
@@ -311,7 +311,7 @@ packages:
     description:
       name: path_provider_platform_interface
       sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "2.1.2"
   path_provider_windows:
@@ -319,7 +319,7 @@ packages:
     description:
       name: path_provider_windows
       sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "2.3.0"
   petitparser:
@@ -327,41 +327,41 @@ packages:
     description:
       name: petitparser
       sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "6.0.2"
   platform:
     dependency: transitive
     description:
       name: platform
-      sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
-      url: "https://pub.dev"
+      sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
-    version: "3.1.6"
+    version: "3.1.4"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
       sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "2.1.8"
   riverpod:
     dependency: transitive
     description:
       name: riverpod
-      sha256: "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959"
-      url: "https://pub.dev"
+      sha256: "0f43c64f1f79c2112c843305a879a746587fb7c1e388f1d4717737796756e2c4"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
-    version: "2.6.1"
+    version: "2.1.3"
   rxdart:
     dependency: transitive
     description:
       name: rxdart
-      sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962"
-      url: "https://pub.dev"
+      sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
-    version: "0.28.0"
+    version: "0.27.7"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -372,7 +372,7 @@ packages:
     description:
       name: source_span
       sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "1.10.0"
   sprintf:
@@ -380,47 +380,47 @@ packages:
     description:
       name: sprintf
       sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23"
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "7.0.0"
   sqflite:
     dependency: transitive
     description:
       name: sqflite
-      sha256: a43e5a27235518c03ca238e7b4732cf35eabe863a369ceba6cbefa537a66f16d
-      url: "https://pub.dev"
+      sha256: "41e55e6756d6af1952d0037bc00ea3b2c989916eaa8ef7ad402161e52c0b3d2d"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
-    version: "2.3.3+1"
+    version: "2.2.5+yxpatch.1"
   sqflite_common:
     dependency: transitive
     description:
       name: sqflite_common
-      sha256: "3da423ce7baf868be70e2c0976c28a1bb2f73644268b7ffa7d2e08eab71f16a4"
-      url: "https://pub.dev"
+      sha256: "8f7603f3f8f126740bc55c4ca2d1027aab4b74a1267a3e31ce51fe40e3b65b8f"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
-    version: "2.5.4"
+    version: "2.4.5+1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
       sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "1.11.1"
   state_notifier:
     dependency: transitive
     description:
       name: state_notifier
-      sha256: b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb
-      url: "https://pub.dev"
+      sha256: "8fe42610f179b843b12371e40db58c9444f8757f8b69d181c97e50787caed289"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
-    version: "1.0.0"
+    version: "0.7.2+1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
       sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "2.1.2"
   string_scanner:
@@ -428,23 +428,23 @@ packages:
     description:
       name: string_scanner
       sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "1.2.0"
   synchronized:
     dependency: transitive
     description:
       name: synchronized
-      sha256: "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558"
-      url: "https://pub.dev"
+      sha256: "5fcbd27688af6082f5abd611af56ee575342c30e87541d0245f7ff99faa02c60"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
-    version: "3.1.0+1"
+    version: "3.1.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "1.2.1"
   test_api:
@@ -452,7 +452,7 @@ packages:
     description:
       name: test_api
       sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "0.6.1"
   typed_data:
@@ -460,7 +460,7 @@ packages:
     description:
       name: typed_data
       sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "1.3.2"
   uuid:
@@ -468,39 +468,39 @@ packages:
     description:
       name: uuid
       sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "4.5.1"
   vector_graphics:
     dependency: transitive
     description:
       name: vector_graphics
-      sha256: "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3"
-      url: "https://pub.dev"
+      sha256: "9b238dc09b8879bca5017e382fb4b5593085e8c960d1ad348415aed3e77cc93a"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
-    version: "1.1.11+1"
+    version: "1.1.11"
   vector_graphics_codec:
     dependency: transitive
     description:
       name: vector_graphics_codec
-      sha256: c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da
-      url: "https://pub.dev"
+      sha256: db6a1e4c526fcf2ab2424a4a9f7fd3b206dd1533b461a87fdbd0b13cd94e4d13
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
-    version: "1.1.11+1"
+    version: "1.1.11"
   vector_graphics_compiler:
     dependency: transitive
     description:
       name: vector_graphics_compiler
-      sha256: "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81"
-      url: "https://pub.dev"
+      sha256: afff56296ac71ce5779449ef33e5c0274bfda8c219de2095b0a4bca0330ba0fe
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
-    version: "1.1.11+1"
+    version: "1.1.11"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "2.1.4"
   visibility_detector:
@@ -508,7 +508,7 @@ packages:
     description:
       name: visibility_detector
       sha256: dd5cc11e13494f432d15939c3aa8ae76844c42b723398643ce9addb88a5ed420
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "0.4.0+2"
   vm_service:
@@ -516,7 +516,7 @@ packages:
     description:
       name: vm_service
       sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "13.0.0"
   web:
@@ -524,23 +524,23 @@ packages:
     description:
       name: web
       sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "0.5.1"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
-      url: "https://pub.dev"
+      sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
-    version: "1.1.0"
+    version: "1.0.4"
   xml:
     dependency: transitive
     description:
       name: xml
       sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226
-      url: "https://pub.dev"
+      url: "https://dart-unpub.taxi.yandex-team.ru"
     source: hosted
     version: "6.5.0"
 sdks:
diff --git a/client/flutter/divkit/lib/src/core/converters/base_specific.dart b/client/flutter/divkit/lib/src/core/converters/base_specific.dart
index 937531c57..27eb93840 100644
--- a/client/flutter/divkit/lib/src/core/converters/base_specific.dart
+++ b/client/flutter/divkit/lib/src/core/converters/base_specific.dart
@@ -25,7 +25,7 @@ extension DivBaseConverter on DivBase {
     );
     final backgrounds = background;
     if (backgrounds != null) {
-      final backgroundWidgets = DivBackgroundConverter.convert(
+      final backgroundWidgets = convertBackgrounds(
         backgrounds,
         viewScale: viewScale,
       );
@@ -59,7 +59,7 @@ extension DivBaseConverter on DivBase {
       viewScale: viewScale,
     );
     if (focusBg != null) {
-      final backgroundWidgets = DivBackgroundConverter.convert(
+      final backgroundWidgets = convertBackgrounds(
         focusBg,
         viewScale: viewScale,
       );
@@ -181,20 +181,14 @@ extension DivBorderConverter on DivBorder {
   }
 }
 
-class DivBackgroundConverter {
-  final List<Widget> backgroundWidgets;
-
-  const DivBackgroundConverter({
-    required this.backgroundWidgets,
-  });
-
-  static List<Widget> convert(
-    List<DivBackground> backgrounds, {
-    required double viewScale,
-  }) {
-    final backgroundWidgets = <Widget>[];
-    // TODO: complicated DivBackground support
-    for (var bg in backgrounds) {
+List<Widget> convertBackgrounds(
+  List<DivBackground> backgrounds, {
+  required double viewScale,
+}) {
+  final backgroundWidgets = <Widget>[];
+  // TODO: complicated DivBackground support
+  for (var bg in backgrounds) {
+    try {
       bg.map(
         divImageBackground: (divImageBackground) {
           final filter = DivFilters.combine(
@@ -322,7 +316,9 @@ class DivBackgroundConverter {
           );
         },
       );
+    } catch (e, st) {
+      logger.warning('Not correct background', error: e, stackTrace: st);
     }
-    return backgroundWidgets;
   }
+  return backgroundWidgets;
 }
diff --git a/client/flutter/divkit/lib/src/core/widgets/text/div_text_widget.dart b/client/flutter/divkit/lib/src/core/widgets/text/div_text_widget.dart
index 54fbf151b..aa5b3f450 100644
--- a/client/flutter/divkit/lib/src/core/widgets/text/div_text_widget.dart
+++ b/client/flutter/divkit/lib/src/core/widgets/text/div_text_widget.dart
@@ -13,7 +13,9 @@ class DivTextWidget extends DivMappingWidget<DivText, DivTextModel> {
   });
 
   Future<void> _onTapRanges(
-      BuildContext context, DivTextRangeModel item) async {
+    BuildContext context,
+    DivTextRangeModel item,
+  ) async {
     final divContext = watch<DivContext>(context);
     if (divContext != null) {
       final actions = item.optionModel.actions;
diff --git a/client/flutter/divkit/pubspec.yaml b/client/flutter/divkit/pubspec.yaml
index 53ce32988..59a59a0dc 100644
--- a/client/flutter/divkit/pubspec.yaml
+++ b/client/flutter/divkit/pubspec.yaml
@@ -2,7 +2,7 @@ name: divkit
 description: Open source SDUI framework for server-driven app updates, rapid UI prototyping, and cross-platform layouts.
 homepage: https://github.com/divkit/divkit
 repository: https://github.com/divkit/divkit
-version: 0.6.0-rc.1
+version: 0.6.0-rc.2
 
 environment:
   sdk: '>=2.17.0 <4.0.0'
diff --git a/client/flutter/divkit/tool/validate.sh b/client/flutter/divkit/tool/validate.sh
index 88a44601c..95f8c008e 100755
--- a/client/flutter/divkit/tool/validate.sh
+++ b/client/flutter/divkit/tool/validate.sh
@@ -3,4 +3,4 @@ set -eu
 
 fvm flutter pub get
 fvm dart format -o none . --set-exit-if-changed
-fvm flutter analyze --no-pub --no-congratulate --no-fatal-infos
+fvm flutter analyze --no-pub --no-congratulate --no-fatal-infos --no-fatal-warnings