Merge pull request #182 from tangem/release/3.3.4

tangem · May 6, 2022 · 2d73d23 · 2d73d23
2 parents dc370ef + c120d90
commit 2d73d23
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,9 @@
-*   bf9adee - (HEAD -> release/3.3.3, tag: develop-146, origin/develop, develop) Merge pull request #178 from tangem/IOS-1620_add_missong_handler
+*   b23c3f1 - (HEAD -> release/3.3.4, tag: develop-148, origin/develop, develop) Merge pull request #181 from tangem/IOS-1612_fix_write_json_rpc
 |\  
-| * 8c94beb - IOS-1620 Add missing handler
-|/  
-* cd22bc8 - (tag: develop-145) Merge pull request #177 from tangem/master
+| *   93e72fb - Merge branch 'develop' into IOS-1612_fix_write_json_rpc
+| |\  
+| |/  
+|/|   
+* | e12cb78 - (tag: develop-147) Merge pull request #180 from tangem/master
+ /  
+* c3e3800 - IOS-1612 Fix write json rpc
diff --git a/TangemSdk.podspec b/TangemSdk.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'TangemSdk'
-  s.version          = '3.3.3'
+  s.version          = '3.3.4'
   s.summary          = 'Use TangemSdk for Tangem cards integration'
 
 # This description is used to generate tags and improve search results.

diff --git a/TangemSdk/TangemSdk/Operations/Files/File.swift b/TangemSdk/TangemSdk/Operations/Files/File.swift
@@ -133,21 +133,21 @@ public enum FileToWrite: Decodable {
                                 startingSignature: file.startingSignature,
                                 finalizingSignature: file.finalizingSignature,
                                 counter: file.counter,
-                                fileName: file.name,
+                                fileName: file.fileName,
                                 fileVisibility: file.fileVisibility,
                                 walletPublicKey: file.walletPublicKey)
         } catch {
             let file = try UserFile(from: decoder)
             self = .byUser(data: file.data,
-                           fileName: file.name,
+                           fileName: file.fileName,
                            fileVisibility: file.fileVisibility,
                            walletPublicKey: file.walletPublicKey)
         }
     }
 
     private struct UserFile: Decodable {
         let data: Data
-        let name: String?
+        let fileName: String?
         let fileVisibility: FileVisibility?
         let walletPublicKey: Data?
     }
@@ -157,7 +157,7 @@ public enum FileToWrite: Decodable {
         let startingSignature: Data
         let finalizingSignature: Data
         let counter: Int
-        let name: String?
+        let fileName: String?
         let fileVisibility: FileVisibility?
         let walletPublicKey: Data?
     }

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.3.3
+3.3.4