From 0ae2d41557290d96a10ee212dd762ec8e9004367 Mon Sep 17 00:00:00 2001 From: Marcos Rodriguez Velez Date: Sun, 24 Mar 2024 16:49:28 -0400 Subject: [PATCH 01/15] FIX: Receive periodic checker didnt clean up on dismiss --- screen/receive/details.js | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/screen/receive/details.js b/screen/receive/details.js index 90a842574..12060b5f4 100644 --- a/screen/receive/details.js +++ b/screen/receive/details.js @@ -101,34 +101,27 @@ const ReceiveDetails = () => { // re-fetching address balance periodically useEffect(() => { - console.log('receive/defails - useEffect'); + console.log('receive/details - useEffect'); - if (fetchAddressInterval.current) { - // interval already exists, lets cleanup it and recreate, so theres no duplicate intervals - clearInterval(fetchAddressInterval.current); - fetchAddressInterval.current = undefined; - } - - fetchAddressInterval.current = setInterval(async () => { + const intervalId = setInterval(async () => { try { const decoded = DeeplinkSchemaMatch.bip21decode(bip21encoded); - const address2use = address || decoded.address; - if (!address2use) return; + const addressToUse = address || decoded.address; + if (!addressToUse) return; - console.log('checking address', address2use, 'for balance...'); - const balance = await BlueElectrum.getBalanceByAddress(address2use); + console.log('checking address', addressToUse, 'for balance...'); + const balance = await BlueElectrum.getBalanceByAddress(addressToUse); console.log('...got', balance); if (balance.unconfirmed > 0) { if (initialConfirmed === 0 && initialUnconfirmed === 0) { - // saving initial values for later (when tx gets confirmed) setInitialConfirmed(balance.confirmed); setInitialUnconfirmed(balance.unconfirmed); setIntervalMs(25000); triggerHapticFeedback(HapticFeedbackTypes.ImpactHeavy); } - const txs = await BlueElectrum.getMempoolTransactionsByAddress(address2use); + const txs = await BlueElectrum.getMempoolTransactionsByAddress(addressToUse); const tx = txs.pop(); if (tx) { const rez = await BlueElectrum.multiGetTransactionByTxid([tx.tx_hash], 10, true); @@ -137,11 +130,9 @@ const ReceiveDetails = () => { const fees = await BlueElectrum.estimateFees(); if (satPerVbyte >= fees.fast) { setEta(loc.formatString(loc.transactions.eta_10m)); - } - if (satPerVbyte >= fees.medium && satPerVbyte < fees.fast) { + } else if (satPerVbyte >= fees.medium) { setEta(loc.formatString(loc.transactions.eta_3h)); - } - if (satPerVbyte < fees.medium) { + } else { setEta(loc.formatString(loc.transactions.eta_1d)); } } @@ -158,7 +149,6 @@ const ReceiveDetails = () => { } else if (balance.unconfirmed === 0 && initialUnconfirmed !== 0) { // now, handling a case when unconfirmed == 0, but in past it wasnt (i.e. it changed while user was // staring at the screen) - const balanceToShow = balance.confirmed - initialConfirmed; if (balanceToShow > 0) { @@ -166,17 +156,12 @@ const ReceiveDetails = () => { setShowConfirmedBalance(true); setShowPendingBalance(false); setShowAddress(false); - - clearInterval(fetchAddressInterval.current); - fetchAddressInterval.current = undefined; - setDisplayBalance( loc.formatString(loc.transactions.received_with_amount, { amt1: formatBalance(balanceToShow, BitcoinUnit.LOCAL_CURRENCY, true).toString(), amt2: formatBalance(balanceToShow, BitcoinUnit.BTC, true).toString(), }), ); - fetchAndSaveWalletTransactions(walletID); } else { // rare case, but probable. transaction evicted from mempool (maybe cancelled by the sender) @@ -189,6 +174,8 @@ const ReceiveDetails = () => { console.log(error); } }, intervalMs); + + return () => clearInterval(intervalId); }, [bip21encoded, address, initialConfirmed, initialUnconfirmed, intervalMs, fetchAndSaveWalletTransactions, walletID]); const renderConfirmedBalance = () => { From f2e33c087f53c871e7057afb3b51dffa2147afa5 Mon Sep 17 00:00:00 2001 From: Marcos Rodriguez Velez Date: Sun, 24 Mar 2024 23:56:07 -0400 Subject: [PATCH 02/15] FIX: Change term to make it easier to understand --- loc/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loc/en.json b/loc/en.json index f66b06872..b614a9adb 100644 --- a/loc/en.json +++ b/loc/en.json @@ -402,7 +402,7 @@ "details_delete": "Delete", "details_delete_wallet": "Delete Wallet", "details_derivation_path": "derivation path", - "details_display": "Display in Wallets List", + "details_display": "Display in Home Screen", "details_export_backup": "Export/Backup", "details_export_history": "Export History to CSV", "details_master_fingerprint": "Master Fingerprint", From 06abbbf281f59c145808cfddf9ace1add05f9775 Mon Sep 17 00:00:00 2001 From: Marcos Rodriguez Velez Date: Tue, 26 Mar 2024 18:48:27 -0400 Subject: [PATCH 03/15] OPS: Merge TestFlight YMLs --- .../build-ios-release-pullrequest.yml | 174 ++++++++--------- .../build-ios-release-testflight.yml | 180 ------------------ 2 files changed, 78 insertions(+), 276 deletions(-) delete mode 100644 .github/workflows/build-ios-release-testflight.yml diff --git a/.github/workflows/build-ios-release-pullrequest.yml b/.github/workflows/build-ios-release-pullrequest.yml index 850d8a504..b6f52daf2 100644 --- a/.github/workflows/build-ios-release-pullrequest.yml +++ b/.github/workflows/build-ios-release-pullrequest.yml @@ -1,5 +1,9 @@ -name: Build Release Pull Request (iOS) +name: Build Release and Upload to TestFlight (iOS) + on: + push: + branches: + - master pull_request: types: [opened, reopened, synchronize, labeled, unlabeled] branches: @@ -8,7 +12,6 @@ on: jobs: build: - if: contains(github.event.pull_request.labels.*.name, 'testflight') runs-on: macos-14 timeout-minutes: 180 outputs: @@ -22,60 +25,55 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 # Fetches all history - - name: Specify node version uses: actions/setup-node@v2-beta with: node-version: 18 - - uses: maxim-lobanov/setup-xcode@v1 with: xcode-version: 15.2 - - name: Set up Ruby uses: ruby/setup-ruby@v1 with: bundler-cache: true - - name: Install dependencies with Bundler run: bundle install - - - name: Install Fastlane 2.217.0 - run: gem install fastlane -v 2.217.0 - - - name: Install CocoaPods - run: sudo gem install cocoapods - + - name: Install Fastlane + run: gem install fastlane -v 2.217.0 # If a specific version is needed for PR or not specified, keep only one version - name: Clear Derived Data run: bundle exec fastlane ios clear_derived_data_lane working-directory: ./ios - - name: Install node_modules run: npm install - + - name: Install CocoaPods Dependencies + run: | + sudo gem install cocoapods # Ensure CocoaPods is installed + bundle exec pod install + working-directory: ./ios + - name: Cache CocoaPods Pods + uses: actions/cache@v2 + with: + path: ios/Pods + key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }} - name: Display release-notes.txt run: cat release-notes.txt - - name: Get Latest Commit Message id: get_latest_commit_message run: | LATEST_COMMIT_MESSAGE=$(git log -1 --pretty=format:"%s") echo "LATEST_COMMIT_MESSAGE=${LATEST_COMMIT_MESSAGE}" >> $GITHUB_ENV echo "::set-output name=commit_message::$LATEST_COMMIT_MESSAGE" - - name: Set up Git Authentication env: ACCESS_TOKEN: ${{ secrets.GIT_ACCESS_TOKEN }} run: | git config --global credential.helper 'cache --timeout=3600' git config --global http.https://github.com/.extraheader "AUTHORIZATION: basic $(echo -n x-access-token:${ACCESS_TOKEN} | base64)" - - name: Create Temporary Keychain run: bundle exec fastlane ios create_temp_keychain working-directory: ./ios - env: + env: KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }} - - name: Setup Provisioning Profiles env: MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} @@ -86,107 +84,91 @@ jobs: KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }} run: bundle exec fastlane ios setup_provisioning_profiles working-directory: ./ios - - name: Generate Build Number based on timestamp id: generate_build_number run: | NEW_BUILD_NUMBER=$(date +%s) echo "NEW_BUILD_NUMBER=$NEW_BUILD_NUMBER" >> $GITHUB_ENV echo "::set-output name=build_number::$NEW_BUILD_NUMBER" - - name: Set Build Number run: bundle exec fastlane ios increment_build_number_lane working-directory: ./ios - - name: Determine Marketing Version id: determine_marketing_version run: | MARKETING_VERSION=$(grep MARKETING_VERSION ios/BlueWallet.xcodeproj/project.pbxproj | awk -F '= ' '{print $2}' | tr -d ' ;' | head -1) echo "PROJECT_VERSION=$MARKETING_VERSION" >> $GITHUB_ENV echo "::set-output name=project_version::$MARKETING_VERSION" - - - name: Expected IPA file name run: | echo "IPA file name: BlueWallet.${{env.PROJECT_VERSION}}(${{env.NEW_BUILD_NUMBER}}).ipa" - - - name: Install CocoaPods Dependencies - run: bundle exec fastlane ios install_pods - working-directory: ./ios - - name: Build App run: bundle exec fastlane ios build_app_lane working-directory: ./ios - - name: Upload IPA as Artifact uses: actions/upload-artifact@v2 with: name: BlueWallet.${{env.PROJECT_VERSION}}(${{env.NEW_BUILD_NUMBER}}).ipa path: ./ios/build/BlueWallet.${{env.PROJECT_VERSION}}(${{ env.NEW_BUILD_NUMBER }}).ipa - testflight-upload: - if: contains(github.event.pull_request.labels.*.name, 'testflight') - needs: build - runs-on: macos-14 - env: - APPLE_ID: ${{ secrets.APPLE_ID }} - NEW_BUILD_NUMBER: ${{ needs.build.outputs.new_build_number }} - PROJECT_VERSION: ${{ needs.build.outputs.project_version }} - LATEST_COMMIT_MESSAGE: ${{ needs.build.outputs.latest_commit_message }} - steps: - - name: Checkout project - uses: actions/checkout@v3 - - - name: Cache Ruby Gems - uses: actions/cache@v2 - with: - path: vendor/bundle - key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }} - restore-keys: | - ${{ runner.os }}-gems- - - - name: Install dependencies with Bundler - run: | - bundle config path vendor/bundle - bundle install --jobs 4 --retry 3 - - - name: Download IPA from Artifact - uses: actions/download-artifact@v2 - with: - name: BlueWallet.${{needs.build.outputs.project_version}}(${{needs.build.outputs.new_build_number}}).ipa - path: ./ios/build - - - name: Create App Store Connect API Key JSON - run: echo '${{ secrets.APP_STORE_CONNECT_API_KEY_CONTENT }}' > ./ios/appstore_api_key.json - - - name: Upload to TestFlight - env: - APP_STORE_CONNECT_API_KEY_PATH: $(pwd)/ios/appstore_api_key.p8 - MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} - MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.GIT_ACCESS_TOKEN }} - GIT_URL: ${{ secrets.GIT_URL }} - ITC_TEAM_ID: ${{ secrets.ITC_TEAM_ID }} - ITC_TEAM_NAME: ${{ secrets.ITC_TEAM_NAME }} - APP_STORE_CONNECT_API_KEY_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY_ID }} - APP_STORE_CONNECT_API_KEY_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ISSUER_ID }} - KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }} - run: bundle exec fastlane ios upload_to_testflight_lane - working-directory: ./ios - - name: Post PR Comment - uses: actions/github-script@v6 - if: success() # Ensures the message is only posted if previous steps succeed - env: - BUILD_NUMBER: ${{ needs.build.outputs.new_build_number }} - LATEST_COMMIT_MESSAGE: ${{ needs.build.outputs.latest_commit_message }} - with: - script: | - const buildNumber = process.env.BUILD_NUMBER; - const message = `The build ${buildNumber} has been uploaded to TestFlight.`; - const prNumber = context.payload.pull_request.number; - const repo = context.repo; - github.rest.issues.createComment({ - ...repo, - issue_number: prNumber, - body: message, - }); + needs: build + runs-on: macos-14 + if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'testflight') + env: + APPLE_ID: ${{ secrets.APPLE_ID }} + NEW_BUILD_NUMBER: ${{ needs.build.outputs.new_build_number }} + PROJECT_VERSION: ${{ needs.build.outputs.project_version }} + LATEST_COMMIT_MESSAGE: ${{ needs.build.outputs.latest_commit_message }} + steps: + - name: Checkout project + uses: actions/checkout@v3 + - name: Cache Ruby Gems + uses: actions/cache@v2 + with: + path: vendor/bundle + key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }} + restore-keys: | + ${{ runner.os }}-gems- + - name: Install dependencies with Bundler + run: | + bundle config path vendor/bundle + bundle install --jobs 4 --retry 3 + - name: Download IPA from Artifact + uses: actions/download-artifact@v2 + with: + name: BlueWallet.${{needs.build.outputs.project_version}}(${{needs.build.outputs.new_build_number}}).ipa + path: ./ios/build + - name: Create App Store Connect API Key JSON + run: echo '${{ secrets.APP_STORE_CONNECT_API_KEY_CONTENT }}' > ./ios/appstore_api_key.json + - name: Upload to TestFlight + env: + APP_STORE_CONNECT_API_KEY_PATH: $(pwd)/ios/appstore_api_key.p8 + MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} + MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.GIT_ACCESS_TOKEN }} + GIT_URL: ${{ secrets.GIT_URL }} + ITC_TEAM_ID: ${{ secrets.ITC_TEAM_ID }} + ITC_TEAM_NAME: ${{ secrets.ITC_TEAM_NAME }} + APP_STORE_CONNECT_API_KEY_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY_ID }} + APP_STORE_CONNECT_API_KEY_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ISSUER_ID }} + KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }} + run: bundle exec fastlane ios upload_to_testflight_lane + working-directory: ./ios + - name: Post PR Comment + if: success() && github.event_name == 'pull_request' + uses: actions/github-script@v6 + env: + BUILD_NUMBER: ${{ needs.build.outputs.new_build_number }} + LATEST_COMMIT_MESSAGE: ${{ needs.build.outputs.latest_commit_message }} + with: + script: | + const buildNumber = process.env.BUILD_NUMBER; + const message = `The build ${buildNumber} has been uploaded to TestFlight.`; + const prNumber = context.payload.pull_request.number; + const repo = context.repo; + github.rest.issues.createComment({ + ...repo, + issue_number: prNumber, + body: message, + }); + \ No newline at end of file diff --git a/.github/workflows/build-ios-release-testflight.yml b/.github/workflows/build-ios-release-testflight.yml deleted file mode 100644 index d35553723..000000000 --- a/.github/workflows/build-ios-release-testflight.yml +++ /dev/null @@ -1,180 +0,0 @@ -name: Build Release and Upload to TestFlight (iOS) - -on: - push: - branches: - - master - -jobs: - build: - runs-on: macos-14 - timeout-minutes: 180 - outputs: - new_build_number: ${{ steps.generate_build_number.outputs.build_number }} - project_version: ${{ steps.determine_marketing_version.outputs.project_version }} - latest_commit_message: ${{ steps.get_latest_commit_message.outputs.commit_message }} - env: - APPLE_ID: ${{ secrets.APPLE_ID }} # Setting the environment variable - steps: - - name: Checkout project - uses: actions/checkout@v3 - with: - fetch-depth: 0 # Fetches all history - - - name: Specify node version - uses: actions/setup-node@v2-beta - with: - node-version: 18 - - - uses: maxim-lobanov/setup-xcode@v1 - with: - xcode-version: 15.2 - - - name: Set up Ruby - uses: ruby/setup-ruby@v1 - with: - bundler-cache: true - - - name: Install dependencies with Bundler - run: bundle install - - - name: Install Fastlane - run: gem install fastlane - - - name: Clear Derived Data - run: bundle exec fastlane ios clear_derived_data_lane - working-directory: ./ios - - - name: Install node_modules - run: npm install - - - name: Install CocoaPods Dependencies - run: bundle exec pod install - working-directory: ./ios - - - name: Cache CocoaPods Pods - uses: actions/cache@v2 - with: - path: ios/Pods - key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }} - - - name: Display release-notes.txt - run: cat release-notes.txt - - - name: Get Latest Commit Message - id: get_latest_commit_message - run: | - LATEST_COMMIT_MESSAGE=$(git log -1 --pretty=format:"%s") - echo "LATEST_COMMIT_MESSAGE=${LATEST_COMMIT_MESSAGE}" >> $GITHUB_ENV - echo "::set-output name=commit_message::$LATEST_COMMIT_MESSAGE" - - - name: Set up Git Authentication - env: - ACCESS_TOKEN: ${{ secrets.GIT_ACCESS_TOKEN }} - run: | - git config --global credential.helper 'cache --timeout=3600' - git config --global http.https://github.com/.extraheader "AUTHORIZATION: basic $(echo -n x-access-token:${ACCESS_TOKEN} | base64)" - - - name: Create Temporary Keychain - run: bundle exec fastlane ios create_temp_keychain - working-directory: ./ios - env: - KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }} - - - name: Setup Provisioning Profiles - env: - MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} - MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.GIT_ACCESS_TOKEN }} - GIT_URL: ${{ secrets.GIT_URL }} - ITC_TEAM_ID: ${{ secrets.ITC_TEAM_ID }} - ITC_TEAM_NAME: ${{ secrets.ITC_TEAM_NAME }} - KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }} - run: bundle exec fastlane ios setup_provisioning_profiles - working-directory: ./ios - - - name: Generate Build Number based on timestamp - id: generate_build_number - run: | - NEW_BUILD_NUMBER=$(date +%s) - echo "NEW_BUILD_NUMBER=$NEW_BUILD_NUMBER" >> $GITHUB_ENV - echo "::set-output name=build_number::$NEW_BUILD_NUMBER" - - - name: Set Build Number - run: bundle exec fastlane ios increment_build_number_lane - working-directory: ./ios - - - name: Determine Marketing Version - id: determine_marketing_version - run: | - MARKETING_VERSION=$(grep MARKETING_VERSION ios/BlueWallet.xcodeproj/project.pbxproj | awk -F '= ' '{print $2}' | tr -d ' ;' | head -1) - echo "PROJECT_VERSION=$MARKETING_VERSION" >> $GITHUB_ENV - echo "::set-output name=project_version::$MARKETING_VERSION" - - - name: Expected IPA file name - run: | - echo "IPA file name: BlueWallet.${{env.PROJECT_VERSION}}(${{env.NEW_BUILD_NUMBER}}).ipa" - - - name: Build App - run: bundle exec fastlane ios build_app_lane - working-directory: ./ios - - - name: Upload IPA as Artifact - uses: actions/upload-artifact@v2 - with: - name: BlueWallet.${{env.PROJECT_VERSION}}(${{env.NEW_BUILD_NUMBER}}).ipa - path: ./ios/build/BlueWallet.${{env.PROJECT_VERSION}}(${{ env.NEW_BUILD_NUMBER }}).ipa - - - testflight-upload: - needs: build - runs-on: macos-14 - env: - APPLE_ID: ${{ secrets.APPLE_ID }} - NEW_BUILD_NUMBER: ${{ needs.build.outputs.new_build_number }} - PROJECT_VERSION: ${{ needs.build.outputs.project_version }} - LATEST_COMMIT_MESSAGE: ${{ needs.build.outputs.latest_commit_message }} - steps: - - name: Checkout project - uses: actions/checkout@v3 - - - name: Cache CocoaPods Pods - uses: actions/cache@v2 - with: - path: ios/Pods - key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }} - - - name: Cache Ruby Gems - uses: actions/cache@v2 - with: - path: vendor/bundle - key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }} - restore-keys: | - ${{ runner.os }}-gems- - - - name: Install dependencies with Bundler - run: | - bundle config path vendor/bundle - bundle install --jobs 4 --retry 3 - - - name: Download IPA from Artifact - uses: actions/download-artifact@v2 - with: - name: BlueWallet.${{needs.build.outputs.project_version}}(${{needs.build.outputs.new_build_number}}).ipa - path: ./ios/build - - - name: Create App Store Connect API Key JSON - run: echo '${{ secrets.APP_STORE_CONNECT_API_KEY_CONTENT }}' > ./ios/appstore_api_key.json - - - name: Upload to TestFlight - env: - APP_STORE_CONNECT_API_KEY_PATH: $(pwd)/ios/appstore_api_key.p8 - MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} - MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.GIT_ACCESS_TOKEN }} - GIT_URL: ${{ secrets.GIT_URL }} - ITC_TEAM_ID: ${{ secrets.ITC_TEAM_ID }} - ITC_TEAM_NAME: ${{ secrets.ITC_TEAM_NAME }} - APP_STORE_CONNECT_API_KEY_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_KEY_ID }} - APP_STORE_CONNECT_API_KEY_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ISSUER_ID }} - KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }} - run: bundle exec fastlane ios upload_to_testflight_lane - working-directory: ./ios \ No newline at end of file From 1329154012c956d18491212ff9517ae387170528 Mon Sep 17 00:00:00 2001 From: Marcos Rodriguez Velez Date: Tue, 26 Mar 2024 23:57:08 -0400 Subject: [PATCH 04/15] OPS: Env --- .github/workflows/build-ios-release-browserstack.yml | 2 +- .github/workflows/build-ios-release-pullrequest.yml | 4 ++-- ios/fastlane/Fastfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-ios-release-browserstack.yml b/.github/workflows/build-ios-release-browserstack.yml index 6e98e33ce..7570250d5 100644 --- a/.github/workflows/build-ios-release-browserstack.yml +++ b/.github/workflows/build-ios-release-browserstack.yml @@ -79,7 +79,7 @@ jobs: - name: Setup Provisioning Profiles env: MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} - MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.GIT_ACCESS_TOKEN }} + GIT_ACCESS_TOKEN: ${{ secrets.GIT_ACCESS_TOKEN }} GIT_URL: ${{ secrets.GIT_URL }} ITC_TEAM_ID: ${{ secrets.ITC_TEAM_ID }} ITC_TEAM_NAME: ${{ secrets.ITC_TEAM_NAME }} diff --git a/.github/workflows/build-ios-release-pullrequest.yml b/.github/workflows/build-ios-release-pullrequest.yml index b6f52daf2..a922e61da 100644 --- a/.github/workflows/build-ios-release-pullrequest.yml +++ b/.github/workflows/build-ios-release-pullrequest.yml @@ -77,7 +77,7 @@ jobs: - name: Setup Provisioning Profiles env: MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} - MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.GIT_ACCESS_TOKEN }} + GIT_ACCESS_TOKEN: ${{ secrets.GIT_ACCESS_TOKEN }} GIT_URL: ${{ secrets.GIT_URL }} ITC_TEAM_ID: ${{ secrets.ITC_TEAM_ID }} ITC_TEAM_NAME: ${{ secrets.ITC_TEAM_NAME }} @@ -145,7 +145,7 @@ jobs: env: APP_STORE_CONNECT_API_KEY_PATH: $(pwd)/ios/appstore_api_key.p8 MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} - MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.GIT_ACCESS_TOKEN }} + GIT_ACCESS_TOKEN: ${{ secrets.GIT_ACCESS_TOKEN }} GIT_URL: ${{ secrets.GIT_URL }} ITC_TEAM_ID: ${{ secrets.ITC_TEAM_ID }} ITC_TEAM_NAME: ${{ secrets.ITC_TEAM_NAME }} diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 1ce442334..f34518f5b 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -66,7 +66,7 @@ platform :ios do platform = options[:platform] || "ios" # Default to iOS if not specified target_to_app_identifier.each do |target, app_identifier| match( - git_basic_authorization: ENV["MATCH_GIT_BASIC_AUTHORIZATION"], + git_basic_authorization: ENV["GIT_ACCESS_TOKEN"], git_url: ENV["GIT_URL"], type: "appstore", platform: platform, From 9345cb8ab71059be1648deabc2b21c6622bda958 Mon Sep 17 00:00:00 2001 From: Marcos Rodriguez Velez Date: Wed, 27 Mar 2024 00:08:29 -0400 Subject: [PATCH 05/15] FIX: Anchor wasnt sent correctly for notifications alert --- screen/lnd/lndCreateInvoice.js | 5 +++-- screen/receive/details.js | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/screen/lnd/lndCreateInvoice.js b/screen/lnd/lndCreateInvoice.js index 68485855a..6904df846 100644 --- a/screen/lnd/lndCreateInvoice.js +++ b/screen/lnd/lndCreateInvoice.js @@ -38,6 +38,7 @@ const LNDCreateInvoice = () => { const { wallets, saveToDisk, setSelectedWalletID } = useContext(BlueStorageContext); const { walletID, uri } = useRoute().params; const wallet = useRef(wallets.find(item => item.getID() === walletID) || wallets.find(item => item.chain === Chain.OFFCHAIN)); + const createInvoiceRef = useRef() const { name } = useRoute(); const { colors } = useTheme(); const { navigate, getParent, goBack, pop, setParams } = useNavigation(); @@ -194,7 +195,7 @@ const LNDCreateInvoice = () => { // lets decode payreq and subscribe groundcontrol so we can receive push notification when our invoice is paid /** @type LightningCustodianWallet */ const decoded = await wallet.current.decodeInvoice(invoiceRequest); - await Notifications.tryToObtainPermissions(); + await Notifications.tryToObtainPermissions(createInvoiceRef); Notifications.majorTomToGroundControl([], [decoded.payment_hash], []); // send to lnurl-withdraw callback url if that exists @@ -317,7 +318,7 @@ const LNDCreateInvoice = () => { const renderCreateButton = () => { return ( - {isLoading ? :