diff --git a/DashWallet.xcodeproj/project.pbxproj b/DashWallet.xcodeproj/project.pbxproj index 20db4c830..9b4f19d43 100644 --- a/DashWallet.xcodeproj/project.pbxproj +++ b/DashWallet.xcodeproj/project.pbxproj @@ -550,6 +550,8 @@ 753261B22CBC157F003CDE00 /* GetStartedViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 753261B12CBC157F003CDE00 /* GetStartedViewController.swift */; }; 75387B4A2E0400C300BCCC72 /* MerchantDenominations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75387B492E0400C300BCCC72 /* MerchantDenominations.swift */; }; 75387B4B2E0400C300BCCC72 /* MerchantDenominations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75387B492E0400C300BCCC72 /* MerchantDenominations.swift */; }; + 753CD8792E2E218800BCF070 /* mixing_anim.json in Resources */ = {isa = PBXBuildFile; fileRef = 753CD8782E2E218800BCF070 /* mixing_anim.json */; }; + 753CD87A2E2E218800BCF070 /* mixing_anim.json in Resources */ = {isa = PBXBuildFile; fileRef = 753CD8782E2E218800BCF070 /* mixing_anim.json */; }; 753E46E82DE1E24300A3FF2A /* CTXSpendModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 753E46E72DE1E24300A3FF2A /* CTXSpendModels.swift */; }; 753E46E92DE1E24300A3FF2A /* CTXSpendModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 753E46E72DE1E24300A3FF2A /* CTXSpendModels.swift */; }; 753F75342DD0D42300D40DFE /* DashSpendPayScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 753F75332DD0D41900D40DFE /* DashSpendPayScreen.swift */; }; @@ -2472,6 +2474,7 @@ 753261AF2CBC11BF003CDE00 /* WelcomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WelcomeViewController.swift; sourceTree = ""; }; 753261B12CBC157F003CDE00 /* GetStartedViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GetStartedViewController.swift; sourceTree = ""; }; 75387B492E0400C300BCCC72 /* MerchantDenominations.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MerchantDenominations.swift; sourceTree = ""; }; + 753CD8782E2E218800BCF070 /* mixing_anim.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = mixing_anim.json; sourceTree = ""; }; 753E46E72DE1E24300A3FF2A /* CTXSpendModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CTXSpendModels.swift; sourceTree = ""; }; 753F75332DD0D41900D40DFE /* DashSpendPayScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DashSpendPayScreen.swift; sourceTree = ""; }; 753F75362DD0D75F00D40DFE /* DashSpendPayViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DashSpendPayViewModel.swift; sourceTree = ""; }; @@ -3891,6 +3894,7 @@ children = ( 2A4430F122CBD57A009BAF7F /* AppAssets.xcassets */, 75E83CF51B5F997A0038FB70 /* coinflip.aiff */, + 753CD8782E2E218800BCF070 /* mixing_anim.json */, ); path = Resources; sourceTree = ""; @@ -7959,6 +7963,7 @@ 474C720F298A1A3E00475CA6 /* TxDetailTaxCategoryCell.xib in Resources */, 2ADC722923B5547000D9DD37 /* Localizable.stringsdict in Resources */, 75E2F3C82AA4CF1900C3B458 /* Topper-Info.plist in Resources */, + 753CD8792E2E218800BCF070 /* mixing_anim.json in Resources */, 2A2CD71822F99CAE008C7BC9 /* ShortcutsView.xib in Resources */, 474C7213298A1EFC00475CA6 /* TxDetailInfoCell.xib in Resources */, 2A9FFE942230FF4700956D5F /* UpholdOTPStoryboard.storyboard in Resources */, @@ -8075,6 +8080,7 @@ C9D2C92E2A320AA000D15901 /* ImportWalletInfo.storyboard in Resources */, C9D2C92F2A320AA000D15901 /* ReceiveContentView.xib in Resources */, C9D2C9302A320AA000D15901 /* VerifySeedPhrase.storyboard in Resources */, + 753CD87A2E2E218800BCF070 /* mixing_anim.json in Resources */, 758CE59D2BC566DE0062AF53 /* PrivacyInfo.xcprivacy in Resources */, 753FDBEC2AECF4CC0005EEC3 /* VotingHeaderView.xib in Resources */, C9D2C9312A320AA000D15901 /* DWSecurityStatusView.xib in Resources */, @@ -8392,6 +8398,7 @@ "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImageSwiftUI/SDWebImageSwiftUI.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/SQLite.swift/SQLite.swift.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/gRPC/gRPCCertificates.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/lottie-ios/LottiePrivacyInfo.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle", ); name = "[CP] Copy Pods Resources"; @@ -8406,6 +8413,7 @@ "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SDWebImageSwiftUI.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SQLite.swift.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/gRPCCertificates.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/LottiePrivacyInfo.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle", ); runOnlyForDeploymentPostprocessing = 0; @@ -8466,6 +8474,7 @@ "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImageSwiftUI/SDWebImageSwiftUI.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/SQLite.swift/SQLite.swift.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/gRPC/gRPCCertificates.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/lottie-ios/LottiePrivacyInfo.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( @@ -8479,6 +8488,7 @@ "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SDWebImageSwiftUI.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SQLite.swift.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/gRPCCertificates.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/LottiePrivacyInfo.bundle", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -10407,7 +10417,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 8.4.0; + MARKETING_VERSION = 8.4.1; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -10547,7 +10557,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 8.4.0; + MARKETING_VERSION = 8.4.1; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -11535,7 +11545,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 8.4.0; + MARKETING_VERSION = 8.4.1; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -11846,7 +11856,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 8.4.0; + MARKETING_VERSION = 8.4.1; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", diff --git a/DashWallet/Resources/mixing_anim.json b/DashWallet/Resources/mixing_anim.json new file mode 100755 index 000000000..df7534ad3 --- /dev/null +++ b/DashWallet/Resources/mixing_anim.json @@ -0,0 +1 @@ +{"v":"4.8.0","meta":{"g":"LottieFiles AE 3.5.4","a":"","k":"","d":"","tc":""},"fr":30,"ip":0,"op":140,"w":523,"h":523,"nm":"Mixing Icon v4","ddd":0,"assets":[{"id":"comp_0","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"dash.logo 2","cl":"logo","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[166.667,166.667,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.132,0.543],[-1.06,0],[0,0],[0.132,-0.543],[1.06,0],[0,0]],"o":[[0.099,-0.417],[0,0],[0,0],[-0.099,0.417],[0,0],[0,0]],"v":[[-5.369,0.172],[-4.058,-0.934],[0.075,-0.934],[-0.098,-0.166],[-1.409,0.94],[-5.541,0.94]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[1666.667,1666.667],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"dash.logo","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false,"cl":"logo"}],"ip":0,"op":300,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"dash.logo","cl":"logo","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[166.667,166.667,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0.51,-2.722],[1.417,-0.656],[1.417,0],[0,0],[0,0],[0,0],[-0.278,0.808],[-0.007,0.556],[1.795,0],[0,0]],"o":[[0,0],[3.55,0],[-0.338,1.828],[-0.636,0.298],[0,0],[0,0],[0,0],[2.132,0.007],[0.106,-0.305],[0.013,-1.079],[0,0],[0,0]],"v":[[-2.323,-4.5],[1.717,-4.5],[5.386,0.156],[2.783,4.036],[0.121,4.5],[-3.906,4.5],[-3.568,2.626],[-0.025,2.626],[2.948,0.897],[3.299,-0.897],[0.988,-2.626],[-2.654,-2.632]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[1666.667,1666.667],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"dash.logo","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false,"cl":"logo"}],"ip":0,"op":300,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"logo","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[166.667,166.667,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[20,20],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":20,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.552941203117,0.89411765337,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[1666.667,1666.667],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"logo","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":300,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"logo 2","parent":2,"refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0,0,0],"ix":2},"a":{"a":0,"k":[166.5,166.5,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[1,1,0.333],"y":[0,0,0]},"t":107,"s":[0,0,100]},{"t":121,"s":[100,100,100]}],"ix":6}},"ao":0,"w":333,"h":333,"ip":107,"op":371,"st":71,"bm":0},{"ddd":0,"ind":2,"ty":3,"nm":"Null 3","sr":1,"ks":{"o":{"a":0,"k":0,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[1],"y":[0]},"t":50,"s":[0]},{"t":134,"s":[360]}],"ix":10},"p":{"a":0,"k":[261.5,261.5,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ip":0,"op":300,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":0,"nm":"logo 2","parent":2,"refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[1],"y":[0]},"t":50,"s":[0]},{"t":134,"s":[-360]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.2,"y":1},"o":{"x":0.5,"y":0},"t":50,"s":[-155,-155,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.797},"o":{"x":1,"y":0},"t":70,"s":[-155.588,-153.25,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.113},"t":107,"s":[-108.167,-108.167,0],"to":[0,0,0],"ti":[0,0,0]},{"t":121,"s":[-80.667,-73.167,0]}],"ix":2},"a":{"a":0,"k":[166.5,166.5,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.2,0.2,0.2],"y":[1,1,1]},"o":{"x":[0.5,0.5,0.5],"y":[0,0,0]},"t":50,"s":[40,40,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":80,"s":[20,20,100]},{"i":{"x":[0.809,0.809,0.667],"y":[1,1,1]},"o":{"x":[1,1,0.333],"y":[0,0,0]},"t":102,"s":[25,25,100]},{"t":121,"s":[35,35,100]}],"ix":6}},"ao":0,"w":333,"h":333,"ip":50,"op":121,"st":-2,"bm":0},{"ddd":0,"ind":4,"ty":0,"nm":"logo 2","parent":2,"refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[1],"y":[0]},"t":50,"s":[0]},{"t":134,"s":[-360]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.2,"y":1},"o":{"x":0.5,"y":0},"t":-5,"s":[0,0,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":15,"s":[-105,-105,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.2,"y":1},"o":{"x":0.5,"y":0},"t":25,"s":[-105,-105,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.2,"y":0.2},"o":{"x":0.167,"y":0.167},"t":45,"s":[-155,-155,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.2,"y":1},"o":{"x":0.5,"y":0},"t":50,"s":[-155,-155,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.84},"o":{"x":1,"y":0},"t":70,"s":[-91,-93.5,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.187},"t":107,"s":[0.125,-141.542,0],"to":[0,0,0],"ti":[0,0,0]},{"t":121,"s":[0.108,-108.225,0]}],"ix":2},"a":{"a":0,"k":[166.5,166.5,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.2,0.2,0.2],"y":[1,1,1]},"o":{"x":[0.5,0.5,0.5],"y":[0,0,0]},"t":-5,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":15,"s":[75,75,100]},{"i":{"x":[0.2,0.2,0.2],"y":[1,1,1]},"o":{"x":[0.5,0.5,0.5],"y":[0,0,0]},"t":25,"s":[75,75,100]},{"i":{"x":[0.2,0.2,0.2],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":45,"s":[40,40,100]},{"i":{"x":[0.2,0.2,0.2],"y":[1,1,1]},"o":{"x":[0.5,0.5,0.5],"y":[0,0,0]},"t":50,"s":[40,40,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":80,"s":[20,20,100]},{"i":{"x":[0.809,0.809,0.667],"y":[1,1,1]},"o":{"x":[1,1,0.333],"y":[0,0,0]},"t":102,"s":[25,25,100]},{"t":121,"s":[35,35,100]}],"ix":6}},"ao":0,"w":333,"h":333,"ip":25,"op":121,"st":-5,"bm":0},{"ddd":0,"ind":5,"ty":0,"nm":"logo 2","parent":2,"refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[1],"y":[0]},"t":50,"s":[0]},{"t":134,"s":[-360]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.2,"y":1},"o":{"x":0.5,"y":0},"t":50,"s":[-100.5,-6.5,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.801},"o":{"x":1,"y":0},"t":70,"s":[-157,159,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.117},"t":107,"s":[-108.167,108.5,0],"to":[0,0,0],"ti":[0,0,0]},{"t":121,"s":[-73.667,79,0]}],"ix":2},"a":{"a":0,"k":[166.5,166.5,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.2,0.2,0.2],"y":[1,1,1]},"o":{"x":[0.5,0.5,0.5],"y":[0,0,0]},"t":50,"s":[40,40,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":80,"s":[20,20,100]},{"i":{"x":[0.809,0.809,0.667],"y":[1,1,1]},"o":{"x":[1,1,0.333],"y":[0,0,0]},"t":102,"s":[25,25,100]},{"t":121,"s":[35,35,100]}],"ix":6}},"ao":0,"w":333,"h":333,"ip":50,"op":121,"st":-1,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"Shape Layer 4","parent":9,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":-89,"ix":10},"p":{"a":0,"k":[57.76,278.357,0],"ix":2},"a":{"a":0,"k":[-65.01,-20.178,0],"ix":1},"s":{"a":0,"k":[125.575,125.575,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":64,"s":[{"i":[[0,0],[0,0],[-11.183,-11.235],[0,0],[0,0],[9.618,8.396]],"o":[[0,0],[0,0],[9.366,9.41],[0,0],[0,0],[-8.276,-7.224]],"v":[[-20.809,-126.867],[-139.36,-5.734],[-98.41,10.018],[-99.722,53.976],[40.053,-64.213],[-4.473,-71.193]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":65,"s":[{"i":[[0,0],[0,0],[-11.183,-11.235],[0,0],[0,0],[9.618,8.396]],"o":[[0,0],[0,0],[9.366,9.41],[0,0],[0,0],[-8.276,-7.224]],"v":[[-34.26,-137.948],[-137.872,-12.513],[-106.758,6.6],[-104.692,48.768],[39.268,-64.287],[-15.103,-66.245]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":67,"s":[{"i":[[0,0],[0,0],[-11.183,-11.235],[0,0],[0,0],[9.618,8.396]],"o":[[0,0],[0,0],[9.366,9.41],[0,0],[0,0],[-8.276,-7.224]],"v":[[-58.098,-123.418],[-146.695,-42.079],[-75.444,-28.099],[-88.287,4.185],[28.223,-64.398],[-25.385,-72.828]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":69,"s":[{"i":[[0,0],[0,0],[-11.183,-11.235],[0,0],[0,0],[9.618,8.396]],"o":[[0,0],[0,0],[9.366,9.41],[0,0],[0,0],[-8.276,-7.224]],"v":[[-58.956,-139.911],[-144.539,-76.902],[-72.698,-41.674],[-90.017,7.04],[3.976,-61.758],[-48.992,-65.322]],"c":true}]},{"t":70,"s":[{"i":[[0,0],[0,0],[-11.183,-11.235],[0,0],[0,0],[9.618,8.396]],"o":[[0,0],[0,0],[9.366,9.41],[0,0],[0,0],[-8.276,-7.224]],"v":[[-59.385,-148.157],[-144.513,-75.946],[-71.325,-48.461],[-90.881,8.468],[-8.148,-60.438],[-60.795,-61.57]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.552917480469,0.894104003906,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":64,"op":71,"st":51,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"Shape Layer 5","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":7,"ix":10},"p":{"a":0,"k":[52.579,57.298,0],"ix":2},"a":{"a":0,"k":[-65.01,-20.178,0],"ix":1},"s":{"a":0,"k":[125.575,125.575,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":61,"s":[{"i":[[0,0],[0,0],[-11.183,-11.235],[0,0],[0,0],[9.618,8.396]],"o":[[0,0],[0,0],[9.366,9.41],[0,0],[0,0],[-8.276,-7.224]],"v":[[-38.483,-162.66],[-178.287,53.396],[-104.778,96.095],[-59.067,144.774],[87.197,-63.168],[33.57,-87.338]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":64,"s":[{"i":[[0,0],[0,0],[-11.183,-11.235],[0,0],[0,0],[9.618,8.396]],"o":[[0,0],[0,0],[9.366,9.41],[0,0],[0,0],[-8.276,-7.224]],"v":[[-31.406,-125.948],[-177.47,23.424],[-113.371,47.043],[-89.166,93.223],[31.506,-74.638],[-14.527,-81.433]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":66,"s":[{"i":[[0,0],[0,0],[-11.183,-11.235],[0,0],[0,0],[9.618,8.396]],"o":[[0,0],[0,0],[9.366,9.41],[0,0],[0,0],[-8.276,-7.224]],"v":[[-51.541,-126.919],[-161.79,0.147],[-110.987,17.946],[-95.326,61.106],[19.518,-74.207],[-30.285,-79.35]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":68,"s":[{"i":[[0,0],[0,0],[-11.183,-11.235],[0,0],[0,0],[9.618,8.396]],"o":[[0,0],[0,0],[9.366,9.41],[0,0],[0,0],[-8.276,-7.224]],"v":[[-66.263,-141.082],[-162.329,-25.56],[-85.879,-8.951],[-86.232,41.462],[6.054,-65.485],[-42.227,-66.508]],"c":true}]},{"t":70,"s":[{"i":[[0,0],[0,0],[-11.183,-11.235],[0,0],[0,0],[9.618,8.396]],"o":[[0,0],[0,0],[9.366,9.41],[0,0],[0,0],[-8.276,-7.224]],"v":[[-76.349,-124.234],[-142.441,-50.021],[-60.77,-35.848],[-51.035,-36.911],[-51.425,-38.404],[-54.169,-53.666]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.552917480469,0.894104003906,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":61,"op":71,"st":51,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"Shape Layer 3","parent":9,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":20,"ix":10},"p":{"a":0,"k":[76.573,24.615,0],"ix":2},"a":{"a":0,"k":[-65.01,-20.178,0],"ix":1},"s":{"a":0,"k":[125.575,125.575,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":31,"s":[{"i":[[0,0],[0,0],[-22.95,-22.5],[0,0],[0,0],[14.603,5.422]],"o":[[0,0],[0,0],[19.984,19.593],[0,0],[0,0],[-34.492,-12.808]],"v":[[16.847,-62.863],[-123.878,25.283],[-69.818,125.749],[-19.635,161.042],[169.004,26.918],[111.755,-64.639]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":32,"s":[{"i":[[0,0],[0,0],[-22.95,-22.5],[0,0],[0,0],[28.85,26.235]],"o":[[0,0],[0,0],[19.984,19.593],[0,0],[0,0],[-35.982,-22.719]],"v":[[29.566,-110.055],[-133.12,36.383],[-91.641,106.37],[-31.582,157.867],[145.503,-2.388],[99.606,-72.741]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":34,"s":[{"i":[[0,0],[0,0],[-22.95,-22.5],[0,0],[0,0],[26.367,23.534]],"o":[[0,0],[0,0],[19.984,19.593],[0,0],[0,0],[-27.45,-24.5]],"v":[[-0.566,-131.668],[-140.017,9.144],[-95.888,74.982],[-74,110.5],[101.97,-40.284],[67.423,-83.625]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":36,"s":[{"i":[[0,0],[0,0],[-9.709,-11.144],[0,0],[0,0],[10.646,9.057]],"o":[[0,0],[0,0],[12.603,14.466],[0,0],[0,0],[-8.542,-7.267]],"v":[[-0.66,-135.641],[-148.286,2.557],[-92.172,39.468],[-83.148,72.384],[77.711,-46.711],[41.37,-75.5]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":38,"s":[{"i":[[0,0],[0,0],[-11.183,-11.235],[0,0],[0,0],[9.618,8.396]],"o":[[0,0],[0,0],[9.366,9.41],[0,0],[0,0],[-8.276,-7.224]],"v":[[-3.908,-112.68],[-156.122,-11.959],[-98.41,10.018],[-87.517,47.97],[34.897,-69.192],[-4.473,-71.193]],"c":true}]},{"t":42,"s":[{"i":[[0,0],[0,0],[-11.183,-11.235],[0,0],[0,0],[9.618,8.396]],"o":[[0,0],[0,0],[9.366,9.41],[0,0],[0,0],[-8.276,-7.224]],"v":[[-52.247,-101.282],[-130.43,-46.406],[-60.77,-35.848],[-77.138,21.818],[-7.41,-56.764],[-54.169,-53.666]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.552917480469,0.894104003906,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":32,"op":43,"st":25,"bm":0},{"ddd":0,"ind":9,"ty":0,"nm":"logo 2","parent":2,"refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[1],"y":[0]},"t":50,"s":[0]},{"t":134,"s":[-360]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.2,"y":1},"o":{"x":0.5,"y":0},"t":0,"s":[0,0,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0.333},"t":20,"s":[-105,-105,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.2,"y":1},"o":{"x":0.5,"y":0},"t":25,"s":[-105,-105,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.2,"y":0.2},"o":{"x":0.167,"y":0.167},"t":45,"s":[-100.5,-6.5,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.2,"y":1},"o":{"x":0.5,"y":0},"t":50,"s":[-100.5,-6.5,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.841},"o":{"x":1,"y":0},"t":70,"s":[-93.5,93.5,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.19},"t":107,"s":[-141.5,0.167,0],"to":[0,0,0],"ti":[0,0,0]},{"t":121,"s":[-108.225,0.108,0]}],"ix":2},"a":{"a":0,"k":[166.5,166.5,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.2,0.2,0.2],"y":[1,1,1]},"o":{"x":[0.5,0.5,0.5],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":20,"s":[75,75,100]},{"i":{"x":[0.2,0.2,0.2],"y":[1,1,1]},"o":{"x":[0.5,0.5,0.5],"y":[0,0,0]},"t":25,"s":[75,75,100]},{"i":{"x":[0.2,0.2,0.2],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":45,"s":[40,40,100]},{"i":{"x":[0.2,0.2,0.2],"y":[1,1,1]},"o":{"x":[0.5,0.5,0.5],"y":[0,0,0]},"t":50,"s":[40,40,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":80,"s":[20,20,100]},{"i":{"x":[0.809,0.809,0.667],"y":[1,1,1]},"o":{"x":[1,1,0.333],"y":[0,0,0]},"t":102,"s":[25,25,100]},{"t":121,"s":[35,35,100]}],"ix":6}},"ao":0,"w":333,"h":333,"ip":0,"op":121,"st":0,"bm":0},{"ddd":0,"ind":10,"ty":0,"nm":"logo 2","parent":2,"refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[1],"y":[0]},"t":50,"s":[0]},{"t":134,"s":[-360]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.2,"y":1},"o":{"x":0.5,"y":0},"t":50,"s":[89.5,22,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.803},"o":{"x":1,"y":0},"t":70,"s":[157.586,-158.75,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.119},"t":107,"s":[108.458,-108.208,0],"to":[0,0,0],"ti":[0,0,0]},{"t":121,"s":[78.458,-75.708,0]}],"ix":2},"a":{"a":0,"k":[166.5,166.5,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.2,0.2,0.2],"y":[1,1,1]},"o":{"x":[0.5,0.5,0.5],"y":[0,0,0]},"t":50,"s":[40,40,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":80,"s":[20,20,100]},{"i":{"x":[0.809,0.809,0.667],"y":[1,1,1]},"o":{"x":[1,1,0.333],"y":[0,0,0]},"t":102,"s":[25,25,100]},{"t":121,"s":[35,35,100]}],"ix":6}},"ao":0,"w":333,"h":333,"ip":50,"op":121,"st":-1,"bm":0},{"ddd":0,"ind":11,"ty":0,"nm":"logo 2","parent":2,"refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[1],"y":[0]},"t":50,"s":[0]},{"t":134,"s":[-360]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.2,"y":1},"o":{"x":0.5,"y":0},"t":-5,"s":[0,0,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":15,"s":[105,104.5,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.2,"y":1},"o":{"x":0.5,"y":0},"t":25,"s":[105,104.5,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.2,"y":0.2},"o":{"x":0.167,"y":0.167},"t":45,"s":[89.5,22,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.2,"y":1},"o":{"x":0.5,"y":0},"t":50,"s":[89.5,22,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.841},"o":{"x":1,"y":0},"t":70,"s":[95,-95.5,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.192},"t":107,"s":[141.833,0.167,0],"to":[0,0,0],"ti":[0,0,0]},{"t":121,"s":[108.442,0.108,0]}],"ix":2},"a":{"a":0,"k":[166.5,166.5,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.2,0.2,0.2],"y":[1,1,1]},"o":{"x":[0.5,0.5,0.5],"y":[0,0,0]},"t":-5,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":15,"s":[75,75,100]},{"i":{"x":[0.2,0.2,0.2],"y":[1,1,1]},"o":{"x":[0.5,0.5,0.5],"y":[0,0,0]},"t":25,"s":[75,75,100]},{"i":{"x":[0.2,0.2,0.2],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":45,"s":[40,40,100]},{"i":{"x":[0.2,0.2,0.2],"y":[1,1,1]},"o":{"x":[0.5,0.5,0.5],"y":[0,0,0]},"t":50,"s":[40,40,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":80,"s":[20,20,100]},{"i":{"x":[0.809,0.809,0.667],"y":[1,1,1]},"o":{"x":[1,1,0.333],"y":[0,0,0]},"t":102,"s":[25,25,100]},{"t":121,"s":[35,35,100]}],"ix":6}},"ao":0,"w":333,"h":333,"ip":25,"op":121,"st":-5,"bm":0},{"ddd":0,"ind":12,"ty":0,"nm":"logo 2","parent":2,"refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[1],"y":[0]},"t":50,"s":[0]},{"t":134,"s":[-360]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.2,"y":1},"o":{"x":0.5,"y":0},"t":50,"s":[158,168,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.8},"o":{"x":1,"y":0},"t":70,"s":[158.5,158,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.116},"t":107,"s":[108.458,108.458,0],"to":[0,0,0],"ti":[0,0,0]},{"t":121,"s":[74.958,76.958,0]}],"ix":2},"a":{"a":0,"k":[166.5,166.5,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.2,0.2,0.2],"y":[1,1,1]},"o":{"x":[0.5,0.5,0.5],"y":[0,0,0]},"t":50,"s":[40,40,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":80,"s":[20,20,100]},{"i":{"x":[0.809,0.809,0.667],"y":[1,1,1]},"o":{"x":[1,1,0.333],"y":[0,0,0]},"t":102,"s":[25,25,100]},{"t":121,"s":[35,35,100]}],"ix":6}},"ao":0,"w":333,"h":333,"ip":50,"op":121,"st":-1,"bm":0},{"ddd":0,"ind":13,"ty":4,"nm":"Shape Layer 15","parent":2,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":128.433,"ix":10},"p":{"a":0,"k":[97.684,49.439,0],"ix":2},"a":{"a":0,"k":[-75.88,-97.647,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":108,"s":[{"i":[[0,0],[3.75,-3.375],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-3.75,3.375],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-81.822,-114.294],[-90.75,-89.375],[-90.245,-82.532],[-90.082,-81.91],[-85.453,-85.62],[-59.464,-81.001]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":109,"s":[{"i":[[0,0],[8.53,-3.187],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-8.104,3.028],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-73.485,-150.418],[-94.5,-131.163],[-124.333,-136.349],[-98.741,-89.095],[-89.095,-99.844],[-56.634,-107.224]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":110,"s":[{"i":[[0,0],[4.764,-5.9],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-5.109,6.327],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-70.967,-150.595],[-93.71,-129.162],[-114.015,-129.355],[-99.978,-82.898],[-84.707,-97.878],[-57.722,-96.775]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":113,"s":[{"i":[[0,0],[3.75,-3.375],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-3.75,3.375],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-78.37,-134.074],[-90.598,-111.626],[-105.858,-116.081],[-89.632,-71.874],[-78.338,-88.186],[-64.376,-86.12]],"c":true}]},{"t":117,"s":[{"i":[[0,0],[3.75,-3.375],[0,0],[0,0],[-6.548,4.933],[0,0]],"o":[[0,0],[-3.75,3.375],[0,0],[0,0],[5.021,-3.783],[0,0]],"v":[[-78.361,-130.789],[-89.133,-124.865],[-105.193,-123.501],[-80.504,-51.526],[-71.241,-57.119],[-60.315,-61.129]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.552917480469,0.894104003906,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":109,"op":121,"st":-3,"bm":0},{"ddd":0,"ind":14,"ty":4,"nm":"Shape Layer 14","parent":2,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":87.433,"ix":10},"p":{"a":0,"k":[104.487,-36.226,0],"ix":2},"a":{"a":0,"k":[-75.88,-97.647,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":108,"s":[{"i":[[0,0],[3.75,-3.375],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-3.75,3.375],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-81.822,-114.294],[-90.75,-89.375],[-90.245,-82.532],[-90.082,-81.91],[-85.453,-85.62],[-59.464,-81.001]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":109,"s":[{"i":[[0,0],[8.53,-3.187],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-8.104,3.028],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-73.485,-150.418],[-94.5,-131.163],[-123.237,-137.516],[-102.677,-86.9],[-89.095,-99.844],[-62.06,-92.608]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":110,"s":[{"i":[[0,0],[4.764,-5.9],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-5.109,6.327],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-70.967,-150.595],[-93.71,-129.162],[-114.015,-129.355],[-99.978,-82.898],[-84.707,-97.878],[-62.638,-89.589]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":113,"s":[{"i":[[0,0],[3.75,-3.375],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-3.75,3.375],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-78.37,-134.074],[-90.598,-111.626],[-105.858,-116.081],[-89.632,-71.874],[-78.338,-88.186],[-64.376,-86.12]],"c":true}]},{"t":117,"s":[{"i":[[0,0],[3.75,-3.375],[0,0],[0,0],[-6.548,4.933],[0,0]],"o":[[0,0],[-3.75,3.375],[0,0],[0,0],[5.021,-3.783],[0,0]],"v":[[-78.361,-130.789],[-89.133,-124.865],[-105.193,-123.501],[-80.504,-51.526],[-71.241,-57.119],[-60.315,-61.129]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.552917480469,0.894104003906,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":109,"op":121,"st":-3,"bm":0},{"ddd":0,"ind":15,"ty":4,"nm":"Shape Layer 13","parent":2,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":218.433,"ix":10},"p":{"a":0,"k":[43.487,-116.726,0],"ix":2},"a":{"a":0,"k":[-75.88,-97.647,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":108,"s":[{"i":[[0,0],[3.75,-3.375],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-3.75,3.375],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-81.822,-114.294],[-90.75,-89.375],[-90.245,-82.532],[-90.082,-81.91],[-85.453,-85.62],[-59.464,-81.001]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":109,"s":[{"i":[[0,0],[7.289,-6.633],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-6.398,5.823],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-70.242,-119.626],[-86.291,-102.092],[-112.213,-107.004],[-90.195,-60.971],[-80.031,-86.322],[-54.241,-78.214]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":110,"s":[{"i":[[0,0],[4.764,-5.9],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-5.109,6.327],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-72.554,-123.874],[-83.713,-103.877],[-106.198,-106.595],[-94.385,-66.413],[-80.418,-81.727],[-52.197,-77.61]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":113,"s":[{"i":[[0,0],[3.75,-3.375],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-3.75,3.375],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-78.37,-134.074],[-90.598,-111.626],[-105.858,-116.081],[-89.632,-71.874],[-78.338,-88.186],[-64.376,-86.12]],"c":true}]},{"t":117,"s":[{"i":[[0,0],[3.75,-3.375],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-3.75,3.375],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-72.111,-158.555],[-104.624,-151.447],[-125.664,-148.124],[-105.645,-61.155],[-72.618,-70.799],[-35.434,-82.027]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.552917480469,0.894104003906,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":109,"op":121,"st":-3,"bm":0},{"ddd":0,"ind":16,"ty":4,"nm":"Shape Layer 12","parent":2,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":186.433,"ix":10},"p":{"a":0,"k":[-55.281,-111.835,0],"ix":2},"a":{"a":0,"k":[-75.88,-97.647,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":108,"s":[{"i":[[0,0],[3.75,-3.375],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-3.75,3.375],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-81.822,-114.294],[-90.75,-89.375],[-90.245,-82.532],[-90.082,-81.91],[-85.453,-85.62],[-59.464,-81.001]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":109,"s":[{"i":[[0,0],[7.289,-6.633],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-6.398,5.823],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-70.242,-119.626],[-86.291,-102.092],[-112.213,-107.004],[-86.967,-63.724],[-80.031,-86.322],[-54.241,-78.214]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":110,"s":[{"i":[[0,0],[4.764,-5.9],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-5.109,6.327],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-72.554,-123.874],[-83.713,-103.877],[-106.198,-106.595],[-87.016,-68.286],[-80.418,-81.727],[-52.197,-77.61]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":113,"s":[{"i":[[0,0],[3.75,-3.375],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-3.75,3.375],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-83.536,-130.932],[-90.598,-111.626],[-105.858,-116.081],[-85.878,-73.577],[-78.338,-88.186],[-64.376,-86.12]],"c":true}]},{"t":117,"s":[{"i":[[0,0],[3.75,-3.375],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-3.75,3.375],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-96.013,-155.914],[-118.854,-141.355],[-149.562,-133.81],[-103.03,-51.968],[-75.018,-72.919],[-29.45,-89.921]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.552917480469,0.894104003906,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":109,"op":121,"st":-3,"bm":0},{"ddd":0,"ind":17,"ty":4,"nm":"Shape Layer 11","parent":2,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":138.433,"ix":10},"p":{"a":0,"k":[-121.407,-37.386,0],"ix":2},"a":{"a":0,"k":[-75.88,-97.647,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":108,"s":[{"i":[[0,0],[3.75,-3.375],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-3.75,3.375],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-81.822,-114.294],[-90.75,-89.375],[-90.245,-82.532],[-90.082,-81.91],[-85.453,-85.62],[-59.464,-81.001]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":109,"s":[{"i":[[0,0],[3.75,-3.375],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-3.75,3.375],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-81.521,-124.562],[-87,-94.838],[-107.849,-95.679],[-91.395,-59.849],[-81.384,-87.015],[-62.403,-80.218]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":110,"s":[{"i":[[0,0],[3.75,-3.375],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-3.75,3.375],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-84.735,-114.393],[-88.163,-95.764],[-106.182,-97.874],[-88.291,-64.163],[-81.319,-81.066],[-55.112,-76.86]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":113,"s":[{"i":[[0,0],[3.75,-3.375],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-3.75,3.375],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-91.241,-132.328],[-99.444,-118.68],[-113.45,-116.483],[-87.869,-75.616],[-84.829,-89.97],[-69.316,-85.311]],"c":true}]},{"t":117,"s":[{"i":[[0,0],[3.75,-3.375],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-3.75,3.375],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-96.013,-155.914],[-118.854,-141.355],[-149.562,-133.81],[-103.03,-51.968],[-75.018,-72.919],[-29.45,-89.921]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.552917480469,0.894104003906,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":109,"op":121,"st":-3,"bm":0},{"ddd":0,"ind":18,"ty":4,"nm":"Shape Layer 10","parent":2,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":97.433,"ix":10},"p":{"a":0,"k":[-110.057,57.874,0],"ix":2},"a":{"a":0,"k":[-75.88,-97.647,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":108,"s":[{"i":[[0,0],[3.75,-3.375],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-3.75,3.375],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-81.822,-114.294],[-90.75,-89.375],[-90.245,-82.532],[-90.082,-81.91],[-85.453,-85.62],[-59.464,-81.001]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":109,"s":[{"i":[[0,0],[3.75,-3.375],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-3.75,3.375],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-72.986,-119.35],[-87,-94.838],[-101.829,-95.751],[-88.291,-64.163],[-81.384,-87.015],[-59.464,-81.001]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":110,"s":[{"i":[[0,0],[3.75,-3.375],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-3.75,3.375],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-75.705,-119.365],[-88.163,-95.764],[-99.373,-96.57],[-88.291,-64.163],[-81.319,-81.066],[-55.112,-76.86]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":113,"s":[{"i":[[0,0],[3.75,-3.375],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-3.75,3.375],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-86.918,-128.16],[-95.227,-116.276],[-113.45,-116.483],[-89.584,-68.784],[-81.166,-82.043],[-58.224,-80.486]],"c":true}]},{"t":117,"s":[{"i":[[0,0],[3.75,-3.375],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-3.75,3.375],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-96.013,-155.914],[-118.854,-141.355],[-149.562,-133.81],[-95.952,-56.654],[-76.168,-74.63],[-48.403,-85.726]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.552917480469,0.894104003906,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":109,"op":121,"st":-3,"bm":0},{"ddd":0,"ind":19,"ty":4,"nm":"Shape Layer 9","parent":2,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":55.433,"ix":10},"p":{"a":0,"k":[-33.307,118.374,0],"ix":2},"a":{"a":0,"k":[-75.88,-97.647,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":108,"s":[{"i":[[0,0],[3.75,-3.375],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-3.75,3.375],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-81.822,-114.294],[-90.75,-89.375],[-90.245,-82.532],[-90.082,-81.91],[-85.453,-85.62],[-59.464,-81.001]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":109,"s":[{"i":[[0,0],[3.75,-3.375],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-3.75,3.375],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-81.822,-114.294],[-90.75,-89.375],[-108.064,-83.154],[-88.291,-64.163],[-85.453,-85.62],[-59.464,-81.001]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":110,"s":[{"i":[[0,0],[3.75,-3.375],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-3.75,3.375],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-81.822,-114.294],[-90.75,-89.375],[-108.064,-83.154],[-88.291,-64.163],[-81.319,-81.066],[-54.897,-78.147]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":113,"s":[{"i":[[0,0],[3.75,-3.375],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-3.75,3.375],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-95.793,-123.724],[-99.042,-104.938],[-117.077,-107.564],[-86.318,-61.142],[-80.896,-80.944],[-55.793,-78.282]],"c":true}]},{"t":117,"s":[{"i":[[0,0],[3.75,-3.375],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-3.75,3.375],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-102.094,-146.069],[-126.236,-131.61],[-150.175,-119.039],[-90.389,-55.444],[-73.178,-69.187],[-54.055,-80.807]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.552917480469,0.894104003906,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":108,"op":121,"st":-3,"bm":0},{"ddd":0,"ind":20,"ty":4,"nm":"Shape Layer 8","parent":2,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":-156.567,"ix":10},"p":{"a":0,"k":[8.572,13.623,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":108,"s":[{"i":[[0,0],[3.75,-3.375],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-3.75,3.375],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-81.822,-114.294],[-90.75,-89.375],[-90.245,-82.532],[-90.082,-81.91],[-85.453,-85.62],[-59.464,-81.001]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":109,"s":[{"i":[[0,0],[3.75,-3.375],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-3.75,3.375],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-81.822,-114.294],[-90.75,-89.375],[-108.064,-83.154],[-88.291,-64.163],[-85.453,-85.62],[-59.464,-81.001]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":110,"s":[{"i":[[0,0],[3.75,-3.375],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-3.75,3.375],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-81.822,-114.294],[-90.75,-89.375],[-108.064,-83.154],[-88.291,-64.163],[-81.319,-81.066],[-54.897,-78.147]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":113,"s":[{"i":[[0,0],[3.75,-3.375],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-3.75,3.375],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-79.677,-107.459],[-86.105,-89.345],[-107.471,-82.729],[-63.929,-46.93],[-65.823,-64.487],[-43.927,-60.695]],"c":true}]},{"t":117,"s":[{"i":[[0,0],[3.75,-3.375],[0,0],[0,0],[-5.75,4.25],[0,0]],"o":[[0,0],[-3.75,3.375],[0,0],[0,0],[5.75,-4.25],[0,0]],"v":[[-76.54,-114.457],[-88.777,-90.337],[-116.049,-73.834],[-49.567,-12.512],[-33.533,-36.87],[-13.74,-48.829]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.552917480469,0.894104003906,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":108,"op":121,"st":-3,"bm":0},{"ddd":0,"ind":21,"ty":0,"nm":"logo 2","parent":2,"refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[1],"y":[0]},"t":50,"s":[0]},{"t":134,"s":[-360]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.2,"y":1},"o":{"x":0.5,"y":0},"t":0,"s":[0,0,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0.333},"t":20,"s":[105,104.5,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.2,"y":1},"o":{"x":0.5,"y":0},"t":25,"s":[105,104.5,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.2,"y":0.2},"o":{"x":0.167,"y":0.167},"t":45,"s":[158,168,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.2,"y":1},"o":{"x":0.5,"y":0},"t":50,"s":[158,168,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.843},"o":{"x":1,"y":0},"t":70,"s":[99.958,88.625,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.201},"t":107,"s":[0.125,141.792,0],"to":[0,0,0],"ti":[0,0,0]},{"t":121,"s":[0.108,108.442,0]}],"ix":2},"a":{"a":0,"k":[166.5,166.5,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.2,0.2,0.2],"y":[1,1,1]},"o":{"x":[0.5,0.5,0.5],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":20,"s":[75,75,100]},{"i":{"x":[0.2,0.2,0.2],"y":[1,1,1]},"o":{"x":[0.5,0.5,0.5],"y":[0,0,0]},"t":25,"s":[75,75,100]},{"i":{"x":[0.2,0.2,0.2],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":45,"s":[40,40,100]},{"i":{"x":[0.2,0.2,0.2],"y":[1,1,1]},"o":{"x":[0.5,0.5,0.5],"y":[0,0,0]},"t":50,"s":[40,40,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":80,"s":[20,20,100]},{"i":{"x":[0.809,0.809,0.667],"y":[1,1,1]},"o":{"x":[1,1,0.333],"y":[0,0,0]},"t":102,"s":[25,25,100]},{"t":121,"s":[35,35,100]}],"ix":6}},"ao":0,"w":333,"h":333,"ip":0,"op":121,"st":0,"bm":0},{"ddd":0,"ind":22,"ty":4,"nm":"Shape Layer 6","parent":11,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":95,"ix":10},"p":{"a":0,"k":[240.342,70.676,0],"ix":2},"a":{"a":0,"k":[-65.01,-20.178,0],"ix":1},"s":{"a":0,"k":[125.575,125.575,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":59,"s":[{"i":[[0,0],[0,0],[-11.183,-11.235],[0,0],[0,0],[9.618,8.396]],"o":[[0,0],[0,0],[9.366,9.41],[0,0],[0,0],[-8.276,-7.224]],"v":[[-29.295,-173.184],[-195.229,-1.188],[-130.619,35.628],[-86.879,103.322],[79.458,-65.956],[9.339,-108.207]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":62,"s":[{"i":[[0,0],[0,0],[-11.183,-11.235],[0,0],[0,0],[9.618,8.396]],"o":[[0,0],[0,0],[9.366,9.41],[0,0],[0,0],[-8.276,-7.224]],"v":[[-29.295,-173.184],[-195.229,-1.188],[-141.128,36.262],[-86.879,103.322],[79.458,-65.956],[9.339,-108.207]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":67,"s":[{"i":[[0,0],[0,0],[-11.183,-11.236],[0,0],[0,0],[9.618,8.396]],"o":[[0,0],[0,0],[9.366,9.409],[0,0],[0,0],[-8.276,-7.224]],"v":[[-68.404,-215.637],[-218.369,-57.066],[-121.259,-40.66],[-114.443,32.566],[40.59,-97.237],[-47.882,-107.223]],"c":true}]},{"t":73,"s":[{"i":[[0,0],[0,0],[-11.183,-11.235],[0,0],[0,0],[25.915,17.806]],"o":[[0,0],[0,0],[9.366,9.41],[0,0],[0,0],[-14.037,-9.645]],"v":[[-72.723,-258.158],[-208.352,-104.695],[-137.514,-69.645],[-108.762,-3.387],[-18.167,-91.511],[-73.533,-115.15]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.552917480469,0.894104003906,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":59,"op":74,"st":54,"bm":0},{"ddd":0,"ind":23,"ty":4,"nm":"Shape Layer 7","parent":12,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":9,"ix":10},"p":{"a":0,"k":[67.329,48.215,0],"ix":2},"a":{"a":0,"k":[-65.01,-20.178,0],"ix":1},"s":{"a":0,"k":[125.575,125.575,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":59,"s":[{"i":[[0,0],[0,0],[-11.183,-11.235],[0,0],[0,0],[9.618,8.396]],"o":[[0,0],[0,0],[9.366,9.41],[0,0],[0,0],[-8.276,-7.224]],"v":[[-6.667,-133.082],[-183.29,29.628],[-111.5,86.331],[-52.568,160.126],[105.828,-44.29],[34.834,-83.874]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":61,"s":[{"i":[[0,0],[0,0],[-11.183,-11.235],[0,0],[0,0],[9.618,8.396]],"o":[[0,0],[0,0],[9.366,9.41],[0,0],[0,0],[-8.276,-7.224]],"v":[[-6.2,-144.674],[-192.28,31.052],[-111.5,86.331],[-52.568,160.126],[105.828,-44.29],[34.834,-83.874]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":66,"s":[{"i":[[0,0],[0,0],[-11.183,-11.235],[0,0],[0,0],[9.618,8.396]],"o":[[0,0],[0,0],[9.366,9.41],[0,0],[0,0],[-8.276,-7.224]],"v":[[-49.731,-153.661],[-215.271,-29.436],[-137.237,8.582],[-99.033,84.835],[43.446,-66.302],[-22.518,-99]],"c":true}]},{"t":73,"s":[{"i":[[0,0],[0,0],[-11.183,-11.235],[0,0],[0,0],[9.618,8.396]],"o":[[0,0],[0,0],[9.366,9.41],[0,0],[0,0],[-8.276,-7.224]],"v":[[-59.48,-183.802],[-194.136,-80.094],[-101.146,-63.503],[-90.481,11.284],[-13.057,-61.706],[-64.128,-91.976]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.552917480469,0.894104003906,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":59,"op":74,"st":54,"bm":0},{"ddd":0,"ind":24,"ty":4,"nm":"Shape Layer 2","parent":21,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":20,"ix":10},"p":{"a":0,"k":[70.286,23.629,0],"ix":2},"a":{"a":0,"k":[-65.01,-20.178,0],"ix":1},"s":{"a":0,"k":[125.575,125.575,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":31,"s":[{"i":[[0,0],[0,0],[-22.95,-22.5],[0,0],[0,0],[14.603,5.422]],"o":[[0,0],[0,0],[19.984,19.593],[0,0],[0,0],[-34.492,-12.808]],"v":[[16.847,-62.863],[-123.878,25.283],[-69.818,125.749],[-19.635,161.042],[169.004,26.918],[111.755,-64.639]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":32,"s":[{"i":[[0,0],[0,0],[-22.95,-22.5],[0,0],[0,0],[28.85,26.235]],"o":[[0,0],[0,0],[19.984,19.593],[0,0],[0,0],[-35.982,-22.719]],"v":[[29.566,-110.055],[-133.12,36.383],[-91.641,106.37],[-31.582,157.867],[145.503,-2.388],[99.606,-72.741]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":34,"s":[{"i":[[0,0],[0,0],[-22.95,-22.5],[0,0],[0,0],[26.367,23.534]],"o":[[0,0],[0,0],[19.984,19.593],[0,0],[0,0],[-27.45,-24.5]],"v":[[-0.566,-131.668],[-140.017,9.144],[-87.656,66.288],[-74,110.5],[98.5,-61],[50.17,-86.3]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":36,"s":[{"i":[[0,0],[0,0],[-9.709,-11.144],[0,0],[0,0],[10.646,9.057]],"o":[[0,0],[0,0],[12.603,14.466],[0,0],[0,0],[-8.542,-7.267]],"v":[[-6.729,-119.76],[-148.286,2.557],[-88.959,18.246],[-83.148,72.384],[35.482,-65.066],[-3.779,-71.828]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":38,"s":[{"i":[[0,0],[0,0],[-10.004,-11.162],[0,0],[0,0],[10.44,8.925]],"o":[[0,0],[0,0],[11.956,13.455],[0,0],[0,0],[-8.489,-7.259]],"v":[[-14.604,-131.194],[-154.481,0.185],[-92.39,19.42],[-84.421,56.813],[58.348,-70.989],[-4.928,-76.292]],"c":true}]},{"t":42,"s":[{"i":[[0,0],[0,0],[-11.183,-11.235],[0,0],[0,0],[9.618,8.396]],"o":[[0,0],[0,0],[9.366,9.41],[0,0],[0,0],[-8.276,-7.224]],"v":[[-55.863,-108.342],[-127.381,-40.187],[-53.421,-51.61],[-77.138,21.818],[-7.41,-56.764],[-49.592,-68.419]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.552917480469,0.894104003906,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":32,"op":43,"st":25,"bm":0},{"ddd":0,"ind":25,"ty":4,"nm":"Shape Layer 1","parent":21,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[106.739,93.501,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[125.575,125.575,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":6,"s":[{"i":[[0,0],[0,0],[-7.431,-6.522],[0,0],[0,0],[11.155,8.704]],"o":[[0,0],[0,0],[6.241,8.032],[0,0],[0,0],[-10.456,-6.953]],"v":[[86.039,-85.227],[-105.113,86.542],[-78.014,112.393],[-51.048,144.568],[119.284,-51.384],[101.865,-66.676]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[{"i":[[0,0],[0,0],[-16.329,-16.822],[0,0],[0,0],[12.267,9.413]],"o":[[0,0],[0,0],[16.294,17.029],[0,0],[0,0],[-4.977,-3.819]],"v":[[20.829,-131.589],[-149.536,27.88],[-101.525,51.078],[-78.574,91.442],[67.97,-71.355],[39.839,-82.001]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":13,"s":[{"i":[[0,0],[0,0],[-13.756,-14.029],[0,0],[0,0],[10.943,8.904]],"o":[[0,0],[0,0],[12.83,13.219],[0,0],[0,0],[-6.627,-5.522]],"v":[[-24.525,-124.858],[-149.669,-7.473],[-79.305,3.798],[-75.882,59.525],[32.254,-63.928],[-7.165,-67.834]],"c":true}]},{"t":16,"s":[{"i":[[0,0],[0,0],[-11.183,-11.235],[0,0],[0,0],[9.618,8.396]],"o":[[0,0],[0,0],[9.366,9.41],[0,0],[0,0],[-8.276,-7.224]],"v":[[-46.719,-118.128],[-140.538,-35.106],[-57.085,-43.481],[-73.19,27.608],[-3.462,-56.5],[-54.169,-53.666]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.552917480469,0.894104003906,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":6,"op":17,"st":0,"bm":0}],"markers":[]} diff --git a/DashWallet/Sources/UI/DashPay/Profile/DWUserProfileViewController.m b/DashWallet/Sources/UI/DashPay/Profile/DWUserProfileViewController.m index db8d44aa2..c57939176 100644 --- a/DashWallet/Sources/UI/DashPay/Profile/DWUserProfileViewController.m +++ b/DashWallet/Sources/UI/DashPay/Profile/DWUserProfileViewController.m @@ -362,11 +362,11 @@ - (void)userProfileContactActionsCell:(DWUserProfileContactActionsCell *)cell se #pragma mark - DWFilterHeaderViewDelegate - (void)filterHeaderView:(DWFilterHeaderView *)view filterButtonAction:(UIView *)sender { - [self - showTxFilterWithDisplayModeCallback:^(DWHomeTxDisplayMode mode) { - self.displayMode = mode; - } - shouldShowRewards:NO]; + [TransactionFilterDialogPresenter presentFrom:self + selectedFilter:self.displayMode + onFilterSelected:^(DWHomeTxDisplayMode mode) { + self.displayMode = mode; + }]; } - (void)filterHeaderView:(DWFilterHeaderView *)view infoButtonAction:(UIView *)sender { @@ -498,6 +498,8 @@ - (NSString *)titleForFilterButton { NSAssert(NO, @"Not implemented here"); return nil; } + + return nil; } @end diff --git a/DashWallet/Sources/UI/DashPay/Voting/VotingFiltersViewController.swift b/DashWallet/Sources/UI/DashPay/Voting/VotingFiltersViewController.swift index 1f5badf9b..2c0dbf676 100644 --- a/DashWallet/Sources/UI/DashPay/Voting/VotingFiltersViewController.swift +++ b/DashWallet/Sources/UI/DashPay/Voting/VotingFiltersViewController.swift @@ -307,3 +307,22 @@ extension VotingFiltersViewController.DataSource { return identifier } } + +// MARK: - FilterItemResetCell + +class FilterItemResetCell: UITableViewCell { + @IBOutlet var resetLabel: UILabel! + + var isEnabled = true { + didSet { + resetLabel.textColor = isEnabled ? .dw_red() : .dw_secondaryText() + } + } + + override func awakeFromNib() { + super.awakeFromNib() + + resetLabel.isUserInteractionEnabled = false + resetLabel.text = NSLocalizedString("Reset Filters", comment: "Explore Dash") + } +} diff --git a/DashWallet/Sources/UI/Home/Views/Cells/CoinJoinProgressView.swift b/DashWallet/Sources/UI/Home/Views/Cells/CoinJoinProgressView.swift index d23418e81..df60143f6 100644 --- a/DashWallet/Sources/UI/Home/Views/Cells/CoinJoinProgressView.swift +++ b/DashWallet/Sources/UI/Home/Views/Cells/CoinJoinProgressView.swift @@ -16,34 +16,44 @@ // import SwiftUI +import Lottie struct CoinJoinProgressView: View { @State var state: MixingStatus @State var progress: Double @State var mixed: Double @State var total: Double + var showBalance: Bool var body: some View { HStack(spacing: 12) { - ZStack { - Circle() - .fill(Color.dashBlue.opacity(0.1)) - .frame(width: 38, height: 38) - - Image("image.coinjoin.menu") - .resizable() - .scaledToFit() - .frame(width: 20, height: 20) + if state == .mixing { + LottieView(animation: .named("mixing_anim")) + .looping() + .frame(width: 34, height: 34) + } else { + LottieView(animation: .named("mixing_anim")) + .currentProgress(1) + .frame(width: 34, height: 34) } VStack(alignment: .leading, spacing: 4) { - CoinJoinProgressInfo(state: state, progress: progress, mixed: mixed, total: total, textColor: .primaryText, font: .subheadline) - .padding(.leading, -6) + CoinJoinProgressInfo( + state: state, + progress: progress, + mixed: mixed, + total: total, + showBalance: showBalance, + textColor: .primaryText, + font: .subheadline + ).padding(.leading, -4) + SwiftUI.ProgressView(value: progress) .progressViewStyle(LinearProgressViewStyle(tint: .dashBlue)) .frame(height: 6) .padding(.top, 2) } + .padding(.leading, 5) } .padding(12) .background(Color.secondaryBackground) @@ -56,17 +66,12 @@ struct CoinJoinProgressInfo: View { @State var progress: Double @State var mixed: Double @State var total: Double + var showBalance: Bool var textColor: Color var font: Font var body: some View { HStack(spacing: 0) { - if state == .mixing { - SwiftUI.ProgressView() - .progressViewStyle(CircularProgressViewStyle(tint: .dashBlue)) - .scaleEffect(0.5) - } - Text(state.localizedValue) .foregroundColor(textColor) .font(font) @@ -81,20 +86,28 @@ struct CoinJoinProgressInfo: View { } Spacer() - Text("\(mixed, format: .number.precision(.fractionLength(0...3))) of \(total, format: .number.precision(.fractionLength(0...3)))") - .foregroundColor(textColor) - .font(font) - Image("icon_dash_currency") - .resizable() - .aspectRatio(contentMode: .fit) - .frame(width: font.pointSize, height: font.pointSize) - .padding(.leading, 2) - .foregroundColor(textColor) + + if showBalance { + Text("\(mixed, format: .number.precision(.fractionLength(0...3))) of \(total, format: .number.precision(.fractionLength(0...3)))") + .foregroundColor(textColor) + .font(font) + + Image("icon_dash_currency") + .resizable() + .aspectRatio(contentMode: .fit) + .frame(width: font.pointSize, height: font.pointSize) + .padding(.leading, 2) + .foregroundColor(textColor) + } else { + Text("****") + .foregroundColor(textColor) + .font(font) + } } } } } #Preview { - CoinJoinProgressView(state: .mixing, progress: 0.45, mixed: 0.123, total: 0.321) + CoinJoinProgressView(state: .mixing, progress: 0.45, mixed: 0.123, total: 0.321, showBalance: true) } diff --git a/DashWallet/Sources/UI/Home/Views/Home Balance View/BalanceModel.swift b/DashWallet/Sources/UI/Home/Views/Home Balance View/BalanceModel.swift index 85d595245..4c4da0a70 100644 --- a/DashWallet/Sources/UI/Home/Views/Home Balance View/BalanceModel.swift +++ b/DashWallet/Sources/UI/Home/Views/Home Balance View/BalanceModel.swift @@ -25,7 +25,7 @@ final class BalanceModel: ObservableObject { @Published private(set) var state = SyncingActivityMonitor.shared.state @Published private(set) var value: UInt64 = 0 - @Published private(set) var isBalanceHidden: Bool { + @Published var isBalanceHidden: Bool { didSet { DWGlobalOptions.sharedInstance().balanceHidden = isBalanceHidden } diff --git a/DashWallet/Sources/UI/Home/Views/Home Balance View/HomeBalanceView.swift b/DashWallet/Sources/UI/Home/Views/Home Balance View/HomeBalanceView.swift index cdd4c3094..d25d91ef7 100644 --- a/DashWallet/Sources/UI/Home/Views/Home Balance View/HomeBalanceView.swift +++ b/DashWallet/Sources/UI/Home/Views/Home Balance View/HomeBalanceView.swift @@ -27,7 +27,7 @@ enum HomeBalanceViewState: Int { // MARK: - HomeBalanceView struct HomeBalanceView: View { - @StateObject private var viewModel = BalanceModel() + @ObservedObject var viewModel: BalanceModel @State private var opacity: Double = 0.3 var onLongPress: () -> Void diff --git a/DashWallet/Sources/UI/Home/Views/HomeView.swift b/DashWallet/Sources/UI/Home/Views/HomeView.swift index 33abe1fb2..71ce594a3 100644 --- a/DashWallet/Sources/UI/Home/Views/HomeView.swift +++ b/DashWallet/Sources/UI/Home/Views/HomeView.swift @@ -183,9 +183,10 @@ struct HomeViewContent: View { @State private var skipToCreateUsername: Bool = false @State private var giftCardTxId: Data? = nil - @StateObject var viewModel: HomeViewModel + @ObservedObject var viewModel: HomeViewModel + @ObservedObject private var balanceModel = BalanceModel() #if DASHPAY - @StateObject var joinDPViewModel: JoinDashPayViewModel + @ObservedObject var joinDPViewModel: JoinDashPayViewModel #endif weak var delegate: HomeViewDelegate? weak var shortcutsDelegate: ShortcutsActionDelegate? @@ -202,7 +203,7 @@ struct HomeViewContent: View { .padding(EdgeInsets(top: -topOverscrollSize, leading: 0, bottom: 0, trailing: 0)) LazyVStack(pinnedViews: [.sectionHeaders]) { - HomeBalanceView { + HomeBalanceView(viewModel: balanceModel) { let action = ShortcutAction(type: .localCurrency) shortcutsDelegate?.shortcutsView(didSelectAction: action, sender: nil) } @@ -220,7 +221,8 @@ struct HomeViewContent: View { state: viewModel.coinJoinItem.state, progress: viewModel.coinJoinItem.progress, mixed: viewModel.coinJoinItem.mixed, - total: viewModel.coinJoinItem.total + total: viewModel.coinJoinItem.total, + showBalance: !balanceModel.isBalanceHidden ) .padding(.horizontal, 15) .id(viewModel.coinJoinItem.id) diff --git a/DashWallet/Sources/UI/Home/Views/TransactionFilterDialog.swift b/DashWallet/Sources/UI/Home/Views/TransactionFilterDialog.swift index 9d465772a..dd0bf84eb 100644 --- a/DashWallet/Sources/UI/Home/Views/TransactionFilterDialog.swift +++ b/DashWallet/Sources/UI/Home/Views/TransactionFilterDialog.swift @@ -1,6 +1,20 @@ import SwiftUI import UIKit +@objc +class TransactionFilterDialogPresenter: NSObject { + @objc static func present(from viewController: UIViewController, selectedFilter: HomeTxDisplayMode, onFilterSelected: @escaping (HomeTxDisplayMode) -> Void) { + let dialog = TransactionFilterDialog( + selectedFilter: selectedFilter, + onFilterSelected: onFilterSelected + ) + + let hostingController = UIHostingController(rootView: dialog) + hostingController.setDetent(350) + viewController.present(hostingController, animated: true) + } +} + struct TransactionFilterDialog: View { @Environment(\.presentationMode) private var presentationMode let selectedFilter: HomeTxDisplayMode diff --git a/DashWallet/Sources/UI/Menu/Settings/SettingsMenuViewController.swift b/DashWallet/Sources/UI/Menu/Settings/SettingsMenuViewController.swift index e59407471..f1148f3f5 100644 --- a/DashWallet/Sources/UI/Menu/Settings/SettingsMenuViewController.swift +++ b/DashWallet/Sources/UI/Menu/Settings/SettingsMenuViewController.swift @@ -259,7 +259,7 @@ struct SettingsMenuContent: View { @ViewBuilder private func CoinJoinSubtitle(_ cjItem: CoinJoinMenuItemModel) -> some View { if cjItem.isOn { - CoinJoinProgressInfo(state: cjItem.state, progress: cjItem.progress, mixed: cjItem.mixed, total: cjItem.total, textColor: .tertiaryText, font: .caption) + CoinJoinProgressInfo(state: cjItem.state, progress: cjItem.progress, mixed: cjItem.mixed, total: cjItem.total, showBalance: !viewModel.isBalanceHidden, textColor: .tertiaryText, font: .caption) .padding(.top, 2) } else { Text(NSLocalizedString("Turned off", comment: "CoinJoin")) diff --git a/DashWallet/Sources/UI/Menu/Settings/SettingsViewModel.swift b/DashWallet/Sources/UI/Menu/Settings/SettingsViewModel.swift index 978078026..de0508e2f 100644 --- a/DashWallet/Sources/UI/Menu/Settings/SettingsViewModel.swift +++ b/DashWallet/Sources/UI/Menu/Settings/SettingsViewModel.swift @@ -33,6 +33,10 @@ class SettingsViewModel: ObservableObject { @Published var items: [MenuItemModel] = [] @Published private(set) var navigationDestination: SettingsNavDest = .none + var isBalanceHidden: Bool { + DWGlobalOptions.sharedInstance().balanceHidden + } + init(model: DWSettingsMenuModel) { self.model = model refreshMenuItems() diff --git a/Podfile b/Podfile index cb95cdb43..dd8361500 100644 --- a/Podfile +++ b/Podfile @@ -19,6 +19,7 @@ target 'dashwallet' do pod 'SDWebImageSwiftUI', '3.1.3', :modular_headers => true pod 'Moya', '~> 15.0' pod 'SwiftJWT', '3.6.200' + pod 'lottie-ios', '4.5.2' # Debugging purposes # pod 'Reveal-SDK', :configurations => ['Debug'] @@ -44,6 +45,7 @@ target 'dashpay' do pod 'Moya', '~> 15.0' pod 'SwiftJWT', '3.6.200' pod 'TOCropViewController', '2.6.1' + pod 'lottie-ios', '4.5.2' # Debugging purposes # pod 'Reveal-SDK', :configurations => ['Debug'] diff --git a/Podfile.lock b/Podfile.lock index 17fd31237..8426d223c 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -698,6 +698,7 @@ PODS: - LoggerAPI (1.9.200): - Logging (~> 1.1) - Logging (1.4.0) + - lottie-ios (4.5.2) - MBProgressHUD (1.1.0) - MMSegmentSlider (1.0.3) - Moya (15.0.0): @@ -744,6 +745,7 @@ DEPENDENCIES: - Firebase/DynamicLinks - FirebaseStorage (= 8.15.0) - KVO-MVVM (= 0.5.6) + - lottie-ios (= 4.5.2) - MBProgressHUD (= 1.1.0) - MMSegmentSlider (from `https://github.com/podkovyrin/MMSegmentSlider`, commit `2d91366`) - Moya (~> 15.0) @@ -788,6 +790,7 @@ SPEC REPOS: - KVO-MVVM - LoggerAPI - Logging + - lottie-ios - MBProgressHUD - Moya - nanopb @@ -855,6 +858,7 @@ SPEC CHECKSUMS: KVO-MVVM: 756673a8e837d7f27ff904fe2883e225e261d8ac LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d Logging: beeb016c9c80cf77042d62e83495816847ef108b + lottie-ios: 96784afc26ea031d3e2b6cae342a4b8915072489 MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9 MMSegmentSlider: db7ee0d6eb2eefbd511179195bf288ff2cebac0a Moya: 138f0573e53411fb3dc17016add0b748dfbd78ee @@ -872,6 +876,6 @@ SPEC CHECKSUMS: TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863 UIViewController-KeyboardAdditions: a691dc7e63a49854d341455a778ee8497dfc4662 -PODFILE CHECKSUM: 0de5c53042a507abba409fff574e1de4efce4a2b +PODFILE CHECKSUM: c34642fc313818ed36dfe39316e79fbe54e36863 COCOAPODS: 1.15.2