From c6c4957cbe39343416e69f8d6fdd07ed3d407e66 Mon Sep 17 00:00:00 2001 From: joemarct Date: Mon, 16 Dec 2024 01:47:30 +0800 Subject: [PATCH] Bumped up app version to v0.21.2 --- package-lock.json | 4 ++-- package.json | 2 +- src-bex/manifest.json | 2 +- src-capacitor/android/app/build.gradle | 4 ++-- src-capacitor/ios/App/App.xcodeproj/project.pbxproj | 8 ++++---- src-capacitor/package-lock.json | 4 ++-- src-capacitor/package.json | 2 +- src/components/walletconnect/WalletConnectV2.vue | 4 ++-- src/wallet/walletconnect2/index.js | 6 +++--- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index 82a810607..72a37d653 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "paytaca", - "version": "0.21.1", + "version": "0.21.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "paytaca", - "version": "0.21.1", + "version": "0.21.2", "dependencies": { "@bitauth/libauth": "2.0.0-alpha.8", "@bitjson/qr-code": "^1.0.2", diff --git a/package.json b/package.json index a180690fd..53095bd42 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "paytaca", - "version": "0.21.1", + "version": "0.21.2", "description": "Secure and convenient Bitcoin Cash wallet app", "productName": "Paytaca", "author": "joemar@paytaca.com", diff --git a/src-bex/manifest.json b/src-bex/manifest.json index f637d1f41..c00a82c58 100644 --- a/src-bex/manifest.json +++ b/src-bex/manifest.json @@ -1,7 +1,7 @@ { "name": "Paytaca", "description": "Secure and convenient Bitcoin Cash wallet app", - "version": "0.21.1", + "version": "0.21.2", "manifest_version": 2, "icons": { "16": "icons/icon-16x16.png", diff --git a/src-capacitor/android/app/build.gradle b/src-capacitor/android/app/build.gradle index c3869feb4..81cf6e55f 100644 --- a/src-capacitor/android/app/build.gradle +++ b/src-capacitor/android/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.paytaca.app" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 103 - versionName "v0.21.1" + versionCode 104 + versionName "v0.21.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. diff --git a/src-capacitor/ios/App/App.xcodeproj/project.pbxproj b/src-capacitor/ios/App/App.xcodeproj/project.pbxproj index dd390d72d..c376b56ee 100644 --- a/src-capacitor/ios/App/App.xcodeproj/project.pbxproj +++ b/src-capacitor/ios/App/App.xcodeproj/project.pbxproj @@ -364,12 +364,12 @@ CODE_SIGN_ENTITLEMENTS = App/App.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 193; + CURRENT_PROJECT_VERSION = 197; DEVELOPMENT_TEAM = 89X576BZBF; INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 0.21.1; + MARKETING_VERSION = 0.21.2; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; PRODUCT_BUNDLE_IDENTIFIER = com.paytaca.app; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -387,12 +387,12 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = App/AppRelease.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 193; + CURRENT_PROJECT_VERSION = 197; DEVELOPMENT_TEAM = 89X576BZBF; INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 0.21.1; + MARKETING_VERSION = 0.21.2; PRODUCT_BUNDLE_IDENTIFIER = com.paytaca.app; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = ""; diff --git a/src-capacitor/package-lock.json b/src-capacitor/package-lock.json index fead82fe6..3b9085dd2 100644 --- a/src-capacitor/package-lock.json +++ b/src-capacitor/package-lock.json @@ -1,12 +1,12 @@ { "name": "paytaca", - "version": "0.21.1", + "version": "0.21.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "paytaca", - "version": "0.21.1", + "version": "0.21.2", "dependencies": { "@capacitor-community/barcode-scanner": "^4.0.1", "@capacitor-community/native-audio": "^5.0.1", diff --git a/src-capacitor/package.json b/src-capacitor/package.json index 390501bed..d8f15f74a 100644 --- a/src-capacitor/package.json +++ b/src-capacitor/package.json @@ -1,6 +1,6 @@ { "name": "paytaca", - "version": "0.21.1", + "version": "0.21.2", "description": "Secure and convenient Bitcoin Cash wallet app", "author": "joemar@paytaca.com", "private": true, diff --git a/src/components/walletconnect/WalletConnectV2.vue b/src/components/walletconnect/WalletConnectV2.vue index 4bc53d675..218b348b8 100644 --- a/src/components/walletconnect/WalletConnectV2.vue +++ b/src/components/walletconnect/WalletConnectV2.vue @@ -894,7 +894,6 @@ watchEffect(() => { }) onBeforeMount(async () => { - loading.value = 'Loading...' await $store.dispatch('global/loadWalletLastAddressIndex') await $store.dispatch('global/loadWalletAddresses') await $store.dispatch('global/loadWalletConnectedApps') @@ -908,6 +907,7 @@ onBeforeMount(async () => { onMounted(async () => { try { + loading.value = 'Loading...' await loadWeb3Wallet() attachEventListeners(web3Wallet.value) if (Object.keys($store.getters['global/lastAddressAndIndex'] || {}).length === 0) { @@ -920,7 +920,7 @@ onMounted(async () => { await $store.dispatch('global/loadWalletAddresses') } walletAddresses.value = $store.getters['global/walletAddresses'] - } catch (error) { loading.value = undefined } + } catch (error) {} finally { loading.value = undefined} }) onUnmounted(() => { diff --git a/src/wallet/walletconnect2/index.js b/src/wallet/walletconnect2/index.js index f7e7e3f52..d5f747e2e 100644 --- a/src/wallet/walletconnect2/index.js +++ b/src/wallet/walletconnect2/index.js @@ -6,21 +6,21 @@ import BCHJS from '@psf/bch-js'; const bchjs = new BCHJS() export const walletConnect2Core = new Core({ - projectId: 'b7c10b6ffc9f3911c913020d9fbb2d51', + projectId: process.env.WALLETCONNECT_PROJECT_ID, }) let _web3wallet /** * @returns {Promise} */ -export async function initWeb3Wallet(opts={forceCreate: false}) { +export async function initWeb3Wallet(opts={forceCreate: true}) { if (!_web3wallet || opts?.forceCreate) { _web3wallet = await Web3Wallet.init({ core: walletConnect2Core, metadata: { name: 'Paytaca', description: 'Paytaca - BCH Wallet App', - url: 'www.paytaca.com', + url: 'https://www.paytaca.com', icons: ['https://walletconnect.org/walletconnect-logo.png'], } })