Merge pull request #208 from sora-xor/release/3.4.0

Release 3.4.0
sora-xor · Oct 22, 2023 · d30ce10 · d30ce10
2 parents 1ca7e7f + 42a8e30
commit d30ce10
Show file tree

Hide file tree

Showing 11 changed files with 69 additions and 28 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -11,7 +11,7 @@ def pipeline = new org.ios.AppPipeline(
     sonar: false,
     sonarProjectName: 'sora-ios',
     sonarProjectKey: 'sora:sora-ios',
-    // appTests: false,
+    appTests: false,
     sonarTestsDirs: './SoraPassportTests,./SoraPassportIntegrationTests,./SoraPassportUITests',
     jobParams: jobParams,
     label: "mac-sora",

diff --git a/Podfile b/Podfile
@@ -31,9 +31,9 @@ abstract_target 'SoraPassportAll' do
   pod 'lottie-ios', '~> 3.5.0'  
   pod 'Nantes'
   pod 'SnapKit'
-  pod 'SoraUIKit', :git => 'https://github.com/soramitsu/ios-ui.git', :tag => '1.0.2'
-  pod 'IdensicMobileSDK', :http => 'https://github.com/PayWings/PayWingsOnboardingKycSDK-iOS-IdensicMobile/archive/v2.2.1.tar.gz'
-  pod 'SCard', :git => 'https://github.com/sora-xor/sora-card-ios', :tag => '1.1.0'
+  pod 'SoraUIKit', :git => 'https://github.com/soramitsu/ios-ui.git', :tag => '1.1.1'
+  pod 'IdensicMobileSDK', :http => 'https://github.com/PayWings/PayWingsOnboardingKycSDK-iOS-IdensicMobile/archive/v2.2.2.tar.gz'
+  pod 'SCard', :git => 'https://github.com/sora-xor/sora-card-ios', :tag => '1.2.0'
   pod 'FLEX', :configurations => ['Debug', 'Dev']
   pod 'XNetworking', :podspec => 'https://raw.githubusercontent.com/soramitsu/x-networking/0.0.57/AppCommonNetworking/XNetworking/XNetworking.podspec'
   pod 'SSFCloudStorage'

diff --git a/Podfile.lock b/Podfile.lock
@@ -156,7 +156,7 @@ PODS:
   - GTMSessionFetcher/Core (3.1.1)
   - GTMSessionFetcher/Full (3.1.1):
     - GTMSessionFetcher/Core
-  - IdensicMobileSDK (1.25.0)
+  - IdensicMobileSDK (1.27.0)
   - IrohaCrypto (0.9.0):
     - IrohaCrypto/BIP39 (= 0.9.0)
     - IrohaCrypto/blake2 (= 0.9.0)
@@ -197,7 +197,7 @@ PODS:
   - nanopb/encode (2.30909.0)
   - Nantes (0.1.2)
   - PayWingsOAuthSDK (1.2.2)
-  - PayWingsOnboardingKYC (5.1.13):
+  - PayWingsOnboardingKYC (5.2.1):
     - VideoID (= 7.1.31)
   - PromisesObjC (2.3.1)
   - PromisesSwift (2.3.1):
@@ -207,13 +207,13 @@ PODS:
   - R.swift.Library (5.3.0)
   - ReachabilitySwift (5.0.0)
   - RobinHood (2.6.8)
-  - SCard (1.1.0):
+  - SCard (1.2.0):
     - IdensicMobileSDK
     - PayWingsOAuthSDK (= 1.2.2)
-    - PayWingsOnboardingKYC (= 5.1.13)
+    - PayWingsOnboardingKYC (= 5.2.1)
     - R.swift (~> 6.1.0)
     - SnapKit
-    - SoraUIKit (~> 1.0.1)
+    - SoraUIKit (~> 1.1.1)
   - scrypt.c (0.1.1)
   - secp256k1.c (0.1.2)
   - SnapKit (5.6.0)
@@ -269,7 +269,7 @@ PODS:
   - SoraUI/PinView (1.10.3):
     - SoraUI/Controls
   - SoraUI/Skrull (1.10.3)
-  - SoraUIKit (1.0.2)
+  - SoraUIKit (1.1.1)
   - Sourcery (1.9.2):
     - Sourcery/CLI-Only (= 1.9.2)
   - Sourcery/CLI-Only (1.9.2)
@@ -319,21 +319,21 @@ DEPENDENCIES:
   - FLEX
   - GoogleAPIClientForREST/Core
   - GoogleAPIClientForREST/Drive
-  - "IdensicMobileSDK (from `{:http=>\"https://github.com/PayWings/PayWingsOnboardingKycSDK-iOS-IdensicMobile/archive/v2.2.1.tar.gz\"}`)"
+  - "IdensicMobileSDK (from `{:http=>\"https://github.com/PayWings/PayWingsOnboardingKycSDK-iOS-IdensicMobile/archive/v2.2.2.tar.gz\"}`)"
   - IrohaCrypto (~> 0.9.0)
   - Kingfisher (from `https://github.com/onevcat/Kingfisher`, branch `version6-xcode13`)
   - lottie-ios (~> 3.5.0)
   - Nantes
   - R.swift (~> 6.1.0)
   - ReachabilitySwift
   - RobinHood
-  - SCard (from `https://github.com/sora-xor/sora-card-ios`, tag `1.1.0`)
+  - SCard (from `https://github.com/sora-xor/sora-card-ios`, tag `1.2.0`)
   - SnapKit
   - SoraDocuments
   - SoraFoundation
   - SoraKeystore
   - SoraUI
-  - SoraUIKit (from `https://github.com/soramitsu/ios-ui.git`, tag `1.0.2`)
+  - SoraUIKit (from `https://github.com/soramitsu/ios-ui.git`, tag `1.1.1`)
   - Sourcery (~> 1.4)
   - SSFCloudStorage
   - Starscream (from `https://github.com/soramitsu/fearless-starscream.git`, branch `feature/without-origin`)
@@ -408,16 +408,16 @@ EXTERNAL SOURCES:
     :branch: feature/fearless-utils-for-sora
     :git: https://github.com/soramitsu/fearless-utils-iOS.git
   IdensicMobileSDK:
-    :http: https://github.com/PayWings/PayWingsOnboardingKycSDK-iOS-IdensicMobile/archive/v2.2.1.tar.gz
+    :http: https://github.com/PayWings/PayWingsOnboardingKycSDK-iOS-IdensicMobile/archive/v2.2.2.tar.gz
   Kingfisher:
     :branch: version6-xcode13
     :git: https://github.com/onevcat/Kingfisher
   SCard:
     :git: https://github.com/sora-xor/sora-card-ios
-    :tag: 1.1.0
+    :tag: 1.2.0
   SoraUIKit:
     :git: https://github.com/soramitsu/ios-ui.git
-    :tag: 1.0.2
+    :tag: 1.1.1
   Starscream:
     :branch: feature/without-origin
     :git: https://github.com/soramitsu/fearless-starscream.git
@@ -435,16 +435,16 @@ CHECKOUT OPTIONS:
     :commit: 26dfc128d0d1f35aac0c44ffab3ef1f2071e003c
     :git: https://github.com/soramitsu/fearless-utils-iOS.git
   IdensicMobileSDK:
-    :http: https://github.com/PayWings/PayWingsOnboardingKycSDK-iOS-IdensicMobile/archive/v2.2.1.tar.gz
+    :http: https://github.com/PayWings/PayWingsOnboardingKycSDK-iOS-IdensicMobile/archive/v2.2.2.tar.gz
   Kingfisher:
     :commit: d0494dd78f7adf2d3526fdf3267176553020c041
     :git: https://github.com/onevcat/Kingfisher
   SCard:
     :git: https://github.com/sora-xor/sora-card-ios
-    :tag: 1.1.0
+    :tag: 1.2.0
   SoraUIKit:
     :git: https://github.com/soramitsu/ios-ui.git
-    :tag: 1.0.2
+    :tag: 1.1.1
   Starscream:
     :commit: 9b26310bfaee979e785fecbf3dbefd2385f0e461
     :git: https://github.com/soramitsu/fearless-starscream.git
@@ -479,29 +479,29 @@ SPEC CHECKSUMS:
   GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084
   GTMAppAuth: 99fb010047ba3973b7026e45393f51f27ab965ae
   GTMSessionFetcher: e8647203b65cee28c5f73d0f473d096653945e72
-  IdensicMobileSDK: 724b75dbb204a9c1ae1dafe5c1366b8aeb00b6cf
+  IdensicMobileSDK: 8b2d40c561e3a7de72841aca9c905b643008edd2
   IrohaCrypto: 6be75a4268cd1f5cec4231c6d3f95cb03f723fd3
   Kingfisher: 8b783c3d7be73a99b2172a743a5bc0a4dd331d79
   lottie-ios: c55158d67d0629a260625cc2ded2052b829e3c3e
   nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
   Nantes: 0396442578e32242223fed46050dea1850236184
   PayWingsOAuthSDK: 97c104c6efa982313fd515c22339279f24ac3461
-  PayWingsOnboardingKYC: abff20d772e9b87e9315b4999feb7401d6557eee
+  PayWingsOnboardingKYC: eaac16a6e95ee1e20931e1633106acfca26c946a
   PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
   PromisesSwift: 28dca69a9c40779916ac2d6985a0192a5cb4a265
   R.swift: ec98ff71c4ab2f6fd01dd077e5afd15e63a4834c
   R.swift.Library: 0fc583cb55a99e28901299cc451614cad1161962
   ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
   RobinHood: b775a72cc0ae55cee3dfb4a5668597aca20ba244
-  SCard: 0f3a1fe782ac1624c92f57df4c029e35c3f8c15b
+  SCard: df6c425839073a27774cdc35c8ffe0a57776e270
   scrypt.c: b42ae06183251329d2b2c620c226fb541a4a3592
   secp256k1.c: db47b726585d80f027423682eb369729e61b3b20
   SnapKit: e01d52ebb8ddbc333eefe2132acf85c8227d9c25
   SoraDocuments: c927a79974f73672a8f39d8c2bb143afca5d3561
   SoraFoundation: 988d90ee3159311b02e42aeba0cf7e85d8bc724c
   SoraKeystore: 92cff6e2a12f212dd64ed089970ff7c365247b1c
   SoraUI: 1ec71151eb962591eeb898bcdd98bded59745f2d
-  SoraUIKit: 258aa43f318cb306b29cdadb52139d794c184333
+  SoraUIKit: 71422b96debe323e73c2046e9a79b2130c2acb07
   Sourcery: 179539341c2261068528cd15a31837b7238fd901
   SSFCloudStorage: 37fbba3ad3e93a637d9c1a9b85910f4fa29596de
   SSFModels: afdeb5bb331de6efa902d961e61a76e1d26aab04
@@ -516,6 +516,6 @@ SPEC CHECKSUMS:
   XNetworking: cda32e6337d2a18edfdb1a39a2e65aa4a1993280
   xxHash-Swift: 30bd6a7507b3b7348a277c49b1cb6346c2905ec7
 
-PODFILE CHECKSUM: 9d773dbdd48e258866a337dffde51262242ae3c3
+PODFILE CHECKSUM: 126e36247e8725acbd8399ac4a086006fc000d3a
 
 COCOAPODS: 1.12.1
diff --git a/SoraPassport.xcodeproj/project.pbxproj b/SoraPassport.xcodeproj/project.pbxproj
@@ -6485,7 +6485,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "#check if env-vars.sh exists\nif [ -f $PROJECT_DIR/SoraPassport/env-vars.sh ]\nthen\nsource $PROJECT_DIR/SoraPassport/env-vars.sh\nfi\n#no `else` case needed if the CI works as expected\n\nWORK_DIR=\"$PROJECT_DIR/SoraPassport\"\necho \"Sourcery Work Directory = $WORK_DIR\"\n\nOUT_FILE=\"$PROJECT_DIR/SoraPassport/CIKeys.generated.swift\"\necho \"Sourcery Output File = $OUT_FILE\"\n\n\"$PODS_ROOT/Sourcery/bin/sourcery\" --templates \"$WORK_DIR\" --sources \"$WORK_DIR\" --output \"$OUT_FILE\" --args soraCardAPIKeyTest=$SORA_CARD_API_KEY_TEST,soraCardAPIKeyProd=$SORA_CARD_API_KEY_PROD,soraCardDomainTest=$SORA_CARD_DOMAIN_TEST,soraCardDomainProd=$SORA_CARD_DOMAIN_PROD,soraCardKYCEndpointUrlTest=$SORA_CARD_KYC_ENDPOINT_URL_TEST,,soraCardKYCEndpointUrlProd=$SORA_CARD_KYC_ENDPOINT_URL_PROD,soraCardKycUsernameTest=$SORA_CARD_KYC_USERNAME_TEST,soraCardKycUsernameProd=$SORA_CARD_KYC_USERNAME_PROD,soraCardKycPasswordTest=$SORA_CARD_KYC_PASSWORD_TEST,soraCardKycPasswordProd=$SORA_CARD_KYC_PASSWORD_PROD,soraCardBackendTestUrl=$SORA_BACKEND_DEBUG,soraCardBackendProdUrl=$SORA_BACKEND_RELEASE,soraCardXOneEndpointTest=$X1_ENDPOINT_URL_DEBUG,soraCardXOneEndpointProd=$X1_ENDPOINT_URL_RELEASE,soraCardXOneIdTest=$X1_WIDGET_ID_DEBUG,soraCardXOneIdProd=$X1_WIDGET_ID_RELEASE,paywingsRepositoryUrl=$PAY_WINGS_REPOSITORY_URL,paywingsUsername=$PAY_WINGS_USERNAME,paywingsPassword=$PAY_WINGS_PASSWORD,soraGoogleUrlScheme=$SORA_GOOGLE_URL_SCHEME_DEBUG,soraGoogleToken=$SORA_GOOGLE_TOKEN_DEBUG\n#add params to the xcconfig files\nvariableNames=(\"SORA_GOOGLE_TOKEN_DEBUG\" \"SORA_GOOGLE_URL_SCHEME_DEBUG\")\n\n# Iterate over the array\nfor variableName in \"${variableNames[@]}\"; do\n    for file in \"$PROJECT_DIR\"/SoraPassport/Configs/*.xcconfig; do\n        if ! grep -q \"^$variableName = ${!variableName}$\" \"$file\"; then\n            echo \"$variableName = ${!variableName}\" >> \"$file\"\n        fi\n    done\ndone\n\nif [ -n \"$JENKINS_URL\" ]; then\n    /usr/libexec/PlistBuddy -c \"Set :CFBundleURLTypes:0:CFBundleURLSchemes:0 $SORA_GOOGLE_URL_SCHEME_DEBUG\" \"$PROJECT_DIR\"/SoraPassport/Info.plist\nfi\n";
+			shellScript = "#check if env-vars.sh exists\nif [ -f $PROJECT_DIR/SoraPassport/env-vars.sh ]\nthen\nsource $PROJECT_DIR/SoraPassport/env-vars.sh\nfi\n#no `else` case needed if the CI works as expected\n\nWORK_DIR=\"$PROJECT_DIR/SoraPassport\"\necho \"Sourcery Work Directory = $WORK_DIR\"\n\nOUT_FILE=\"$PROJECT_DIR/SoraPassport/CIKeys.generated.swift\"\necho \"Sourcery Output File = $OUT_FILE\"\n\n\"$PODS_ROOT/Sourcery/bin/sourcery\" --templates \"$WORK_DIR\" --sources \"$WORK_DIR\" --output \"$OUT_FILE\" --args soraCardAPIKeyTest=$SORA_CARD_API_KEY_TEST,soraCardAPIKeyProd=$SORA_CARD_API_KEY_PROD,soraCardDomainTest=$SORA_CARD_DOMAIN_TEST,soraCardDomainProd=$SORA_CARD_DOMAIN_PROD,soraCardKYCEndpointUrlTest=$SORA_CARD_KYC_ENDPOINT_URL_TEST,,soraCardKYCEndpointUrlProd=$SORA_CARD_KYC_ENDPOINT_URL_PROD,soraCardKycUsernameTest=$SORA_CARD_KYC_USERNAME_TEST,soraCardKycUsernameProd=$SORA_CARD_KYC_USERNAME_PROD,soraCardKycPasswordTest=$SORA_CARD_KYC_PASSWORD_TEST,soraCardKycPasswordProd=$SORA_CARD_KYC_PASSWORD_PROD,soraCardBackendTestUrl=$SORA_BACKEND_DEBUG,soraCardBackendProdUrl=$SORA_BACKEND_RELEASE,soraCardXOneEndpointTest=$X1_ENDPOINT_URL_DEBUG,soraCardXOneEndpointProd=$X1_ENDPOINT_URL_RELEASE,soraCardXOneIdTest=$X1_WIDGET_ID_DEBUG,soraCardXOneIdProd=$X1_WIDGET_ID_RELEASE,paywingsRepositoryUrl=$PAY_WINGS_REPOSITORY_URL,paywingsUsername=$PAY_WINGS_USERNAME,paywingsPassword=$PAY_WINGS_PASSWORD,soraGoogleUrlScheme=$SORA_IOS_GOOGLE_URL_SCHEME_PROD,soraGoogleToken=$SORA_IOS_GOOGLE_TOKEN_PROD\n#add params to the xcconfig files\nvariableNames=(\"SORA_IOS_GOOGLE_TOKEN_PROD\" \"SORA_IOS_GOOGLE_URL_SCHEME_PROD\")\n\n# Iterate over the array\nfor variableName in \"${variableNames[@]}\"; do\n    for file in \"$PROJECT_DIR\"/SoraPassport/Configs/*.xcconfig; do\n        if ! grep -q \"^$variableName = ${!variableName}$\" \"$file\"; then\n            echo \"$variableName = ${!variableName}\" >> \"$file\"\n        fi\n    done\ndone\n\nif [ -n \"$JENKINS_URL\" ]; then\n    /usr/libexec/PlistBuddy -c \"Set :CFBundleURLTypes:0:CFBundleURLSchemes:0 $SORA_IOS_GOOGLE_URL_SCHEME_PROD\" \"$PROJECT_DIR\"/SoraPassport/Info.plist\nfi\n";
 		};
 		37A2EE60FE262A54518B6264 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;

diff --git a/SoraPassport/Info.plist b/SoraPassport/Info.plist
@@ -27,14 +27,14 @@
 			<string>Editor</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>$(SORA_GOOGLE_URL_SCHEME_DEBUG)</string>
+				<string>$(SORA_IOS_GOOGLE_URL_SCHEME_PROD)</string>
 			</array>
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
 	<string>4</string>
 	<key>GIDClientID</key>
-	<string>$(SORA_GOOGLE_TOKEN_DEBUG)</string>
+	<string>$(SORA_IOS_GOOGLE_TOKEN_PROD)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSCameraUsageDescription</key>

diff --git a/SoraPassport/ModulesRedesign/AssetDetails/Pooled/PooledCell.swift b/SoraPassport/ModulesRedesign/AssetDetails/Pooled/PooledCell.swift
@@ -69,6 +69,13 @@ extension PooledCell: SoramitsuTableViewCellProtocol {
             poolView.sora.titleText = poolModel.title
             poolView.sora.subtitleText = poolModel.subtitle
             poolView.sora.upAmountText = poolModel.fiatText
+            poolView.firstCurrencyImageView.sora.loadingPlaceholder.type = .none
+            poolView.secondCurrencyImageView.sora.loadingPlaceholder.type = .none
+            poolView.rewardImageView.sora.loadingPlaceholder.type = .none
+            poolView.titleLabel.sora.loadingPlaceholder.type = .none
+            poolView.subtitleLabel.sora.loadingPlaceholder.type = .none
+            poolView.amountUpLabel.sora.loadingPlaceholder.type = .none
+            poolView.amountDownLabel.sora.loadingPlaceholder.type = .none
             poolView.sora.addHandler(for: .touchUpInside) {
                 item.openPoolDetailsHandler?(poolModel.identifier)
             }

diff --git a/SoraPassport/ModulesRedesign/ManageProduct/Asset/AssetListCell.swift b/SoraPassport/ModulesRedesign/ManageProduct/Asset/AssetListCell.swift
@@ -9,6 +9,11 @@ final class AssetListCell: SoramitsuTableViewCell {
         view.sora.favoriteButtonImage = R.image.wallet.star()
         view.sora.unfavoriteButtonImage = R.image.wallet.unstar()
         view.sora.dragDropImage = R.image.wallet.burger()
+        view.assetImageView.sora.loadingPlaceholder.type = .none
+        view.titleLabel.sora.loadingPlaceholder.type = .none
+        view.subtitleLabel.sora.loadingPlaceholder.type = .none
+        view.amountUpLabel.sora.loadingPlaceholder.type = .none
+        view.amountDownLabel.sora.loadingPlaceholder.type = .none
         view.favoriteButton.sora.associate(states: .pressed) { [weak self] g in
             guard let item = self?.assetItem else {
                 return

diff --git a/SoraPassport/ModulesRedesign/ManageProduct/Pool/PoolListCell.swift b/SoraPassport/ModulesRedesign/ManageProduct/Pool/PoolListCell.swift
@@ -9,6 +9,13 @@ final class PoolListCell: SoramitsuTableViewCell {
         view.sora.favoriteButtonImage = R.image.wallet.star()
         view.sora.unfavoriteButtonImage = R.image.wallet.unstar()
         view.sora.unvisibilityButtonImage = R.image.wallet.crossedOutEye()
+        view.firstCurrencyImageView.sora.loadingPlaceholder.type = .none
+        view.secondCurrencyImageView.sora.loadingPlaceholder.type = .none
+        view.rewardImageView.sora.loadingPlaceholder.type = .none
+        view.titleLabel.sora.loadingPlaceholder.type = .none
+        view.subtitleLabel.sora.loadingPlaceholder.type = .none
+        view.amountUpLabel.sora.loadingPlaceholder.type = .none
+        view.amountDownLabel.sora.loadingPlaceholder.type = .none
         view.favoriteButton.sora.associate(states: .pressed) { [weak self] g in
             guard let item = self?.assetItem else { return }
             view.sora.isFavorite.toggle()

diff --git a/SoraPassport/ModulesRedesign/Wallet/Assets/AssetsCell.swift b/SoraPassport/ModulesRedesign/Wallet/Assets/AssetsCell.swift
@@ -141,6 +141,11 @@ extension AssetsCell: SoramitsuTableViewCellProtocol {
             assetView.sora.isHidden = !item.isExpand
             assetView.sora.upAmountText = assetModel.fiatText
             assetView.tappableArea.sora.isHidden = false
+            assetView.assetImageView.sora.loadingPlaceholder.type = .none
+            assetView.titleLabel.sora.loadingPlaceholder.type = .none
+            assetView.subtitleLabel.sora.loadingPlaceholder.type = .none
+            assetView.amountUpLabel.sora.loadingPlaceholder.type = .none
+            assetView.amountDownLabel.sora.loadingPlaceholder.type = .none
             assetView.tappableArea.sora.addHandler(for: .touchUpInside) { [weak assetsItem] in
                 assetsItem?.assetHandler?(assetModel.identifier)
             }

diff --git a/SoraPassport/ModulesRedesign/Wallet/Pools/PoolsCell.swift b/SoraPassport/ModulesRedesign/Wallet/Pools/PoolsCell.swift
@@ -140,6 +140,13 @@ extension PoolsCell: SoramitsuTableViewCellProtocol {
             poolView.sora.subtitleText = poolModel.subtitle
             poolView.sora.isHidden = !item.isExpand
             poolView.sora.upAmountText = poolModel.fiatText
+            poolView.firstCurrencyImageView.sora.loadingPlaceholder.type = .none
+            poolView.secondCurrencyImageView.sora.loadingPlaceholder.type = .none
+            poolView.rewardImageView.sora.loadingPlaceholder.type = .none
+            poolView.titleLabel.sora.loadingPlaceholder.type = .none
+            poolView.subtitleLabel.sora.loadingPlaceholder.type = .none
+            poolView.amountUpLabel.sora.loadingPlaceholder.type = .none
+            poolView.amountDownLabel.sora.loadingPlaceholder.type = .none
             poolView.sora.addHandler(for: .touchUpInside) { [weak poolsItem] in
                 poolsItem?.poolHandler?(poolModel.identifier)
             }

diff --git a/SoraPassport/ModulesRedesign/Wallet/WalletViewModel+SCard.swift b/SoraPassport/ModulesRedesign/Wallet/WalletViewModel+SCard.swift
@@ -13,9 +13,19 @@ extension RedesignWalletViewModel {
         }
         startTotalBalanceStream()
 
+        #if F_DEV
+        let config = SCard.Config.test // Sora Dev
+        #elseif F_TEST
+        let config = SCard.Config.test // Soralution
+        #elseif F_STAGING
+        let config = SCard.Config.prod // Sora Staging
+        #else
+        let config = SCard.Config.prod // SORA release
+        #endif
+
         let soraCard = SCard(
             addressProvider: { SelectedWalletSettings.shared.currentAccount?.address ?? "" },
-            config: .test,
+            config: config,
             balanceStream: xorBalanceStream,
             onSwapController: { [weak self] vc in
                 self?.showSwapController(in: vc)