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 850d8a504..d6f5b915a 100644 --- a/.github/workflows/build-ios-release-pullrequest.yml +++ b/.github/workflows/build-ios-release-pullrequest.yml @@ -1,14 +1,17 @@ -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] + types: [opened, reopened, synchronize, labeled] branches: - master workflow_dispatch: jobs: build: - if: contains(github.event.pull_request.labels.*.name, 'testflight') runs-on: macos-14 timeout-minutes: 180 outputs: @@ -22,171 +25,150 @@ 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 }} - 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 }} 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 }} + 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 }} + 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 diff --git a/BlueApp.ts b/BlueApp.ts index 4b748f356..3fe954a5f 100644 --- a/BlueApp.ts +++ b/BlueApp.ts @@ -863,7 +863,7 @@ export class AppStorage { if (doNotTrackValue) { await DefaultPreference.set(AppStorage.DO_NOT_TRACK, '1'); AsyncStorage.removeItem(AppStorage.DO_NOT_TRACK); - } + } } catch (_) {} return false; }; diff --git a/BlueComponents.js b/BlueComponents.js index 409cf4ce8..bf6740650 100644 --- a/BlueComponents.js +++ b/BlueComponents.js @@ -4,7 +4,6 @@ import PropTypes from 'prop-types'; import { Icon, Text, Header } from 'react-native-elements'; import { ActivityIndicator, - Animated, Dimensions, Image, InputAccessoryView, @@ -204,80 +203,6 @@ export const BluePrivateBalance = () => { ); }; -export const BlueCopyToClipboardButton = ({ stringToCopy, displayText = false }) => { - return ( - Clipboard.setString(stringToCopy)}> - {displayText || loc.transactions.details_copy} - - ); -}; - -export class BlueCopyTextToClipboard extends Component { - static propTypes = { - text: PropTypes.string, - truncated: PropTypes.bool, - }; - - static defaultProps = { - text: '', - truncated: false, - }; - - constructor(props) { - super(props); - this.state = { hasTappedText: false, address: props.text }; - } - - static getDerivedStateFromProps(props, state) { - if (state.hasTappedText) { - return { hasTappedText: state.hasTappedText, address: state.address, truncated: props.truncated }; - } else { - return { hasTappedText: state.hasTappedText, address: props.text, truncated: props.truncated }; - } - } - - copyToClipboard = () => { - this.setState({ hasTappedText: true }, () => { - Clipboard.setString(this.props.text); - this.setState({ address: loc.wallets.xpub_copiedToClipboard }, () => { - setTimeout(() => { - this.setState({ hasTappedText: false, address: this.props.text }); - }, 1000); - }); - }); - }; - - render() { - return ( - - - - {this.state.address} - - - - ); - } -} - -const styleCopyTextToClipboard = StyleSheet.create({ - address: { - marginVertical: 32, - fontSize: 15, - color: '#9aa0aa', - textAlign: 'center', - }, -}); - export const BlueCard = props => { return ; }; diff --git a/Navigation.tsx b/Navigation.tsx index 3a69346e1..1f392bc0d 100644 --- a/Navigation.tsx +++ b/Navigation.tsx @@ -639,7 +639,7 @@ const Navigation = () => { /> - void; } -export const Button: React.FC = props => { +export const Button = forwardRef((props, ref) => { const { colors } = useTheme(); let backgroundColor = props.backgroundColor ?? colors.mainColor; @@ -42,6 +42,7 @@ export const Button: React.FC = props => { return ( = props => { ); -}; +}); const styles = StyleSheet.create({ button: { diff --git a/components/CopyTextToClipboard.tsx b/components/CopyTextToClipboard.tsx new file mode 100644 index 000000000..d21ee8228 --- /dev/null +++ b/components/CopyTextToClipboard.tsx @@ -0,0 +1,65 @@ +import Clipboard from '@react-native-clipboard/clipboard'; +import React, { useState, useEffect, forwardRef } from 'react'; +import { View, TouchableOpacity, Animated, StyleSheet } from 'react-native'; +import loc from '../loc'; + +type CopyTextToClipboardProps = { + text: string; + truncated?: boolean; +}; + +const styleCopyTextToClipboard = StyleSheet.create({ + address: { + marginVertical: 32, + fontSize: 15, + color: '#9aa0aa', + textAlign: 'center', + }, +}); + +const CopyTextToClipboard = forwardRef(({ text, truncated }, ref) => { + const [hasTappedText, setHasTappedText] = useState(false); + const [address, setAddress] = useState(text); + + useEffect(() => { + if (!hasTappedText) { + setAddress(text); + } + }, [text, hasTappedText]); + + const copyToClipboard = () => { + setHasTappedText(true); + Clipboard.setString(text); + setAddress(loc.wallets.xpub_copiedToClipboard); // Adjust according to your localization logic + setTimeout(() => { + setHasTappedText(false); + setAddress(text); + }, 1000); + }; + + return ( + + + + {address} + + + + ); +}); + +export default CopyTextToClipboard; + +const styles = StyleSheet.create({ + container: { justifyContent: 'center', alignItems: 'center', paddingHorizontal: 16 }, +}); diff --git a/components/CopyToClipboardButton.tsx b/components/CopyToClipboardButton.tsx new file mode 100644 index 000000000..d2d56662d --- /dev/null +++ b/components/CopyToClipboardButton.tsx @@ -0,0 +1,27 @@ +import Clipboard from '@react-native-clipboard/clipboard'; +import React from 'react'; +import { TouchableOpacity, Text, StyleSheet } from 'react-native'; +import loc from '../loc'; + +type CopyToClipboardButtonProps = { + stringToCopy: string; + displayText?: string; +}; + +export const CopyToClipboardButton: React.FC = ({ stringToCopy, displayText }) => { + const onPress = () => { + Clipboard.setString(stringToCopy); + }; + + return ( + + {displayText && displayText.length > 0 ? displayText : loc.transactions.details_copy} + + ); +}; + +const styles = StyleSheet.create({ + text: { fontSize: 13, fontWeight: '400', color: '#68bbe1' }, +}); + +export default CopyToClipboardButton; diff --git a/ios/BlueWallet.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/BlueWallet.xcworkspace/xcshareddata/swiftpm/Package.resolved index 5b88b3334..20e39091f 100644 --- a/ios/BlueWallet.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ios/BlueWallet.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -29,5 +29,5 @@ } } ], - "version" : 3 + "version" : 2 } 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, 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", diff --git a/package.json b/package.json index 034b3a7ac..c3f0e897f 100644 --- a/package.json +++ b/package.json @@ -154,7 +154,7 @@ "react-native-draggable-flatlist": "github:BlueWallet/react-native-draggable-flatlist#ebfddc4", "react-native-elements": "3.4.3", "react-native-fs": "2.20.0", - "react-native-gesture-handler": "2.15.0", + "react-native-gesture-handler": "2.16.0", "react-native-handoff": "https://github.com/BlueWallet/react-native-handoff#31d005f93d31099d0e564590a3bbd052b8a02b39", "react-native-haptic-feedback": "2.2.0", "react-native-idle-timer": "https://github.com/BlueWallet/react-native-idle-timer#8587876d68ab5920e79619726aeca9e672beaf2b", @@ -183,7 +183,7 @@ "react-native-tcp-socket": "6.0.6", "react-native-vector-icons": "10.0.3", "react-native-watch-connectivity": "1.1.0", - "react-native-webview": "13.8.2", + "react-native-webview": "13.8.4", "react-native-widget-center": "https://github.com/BlueWallet/react-native-widget-center#a128c38", "readable-stream": "3.6.2", "realm": "12.6.2", diff --git a/screen/lnd/lndCreateInvoice.js b/screen/lnd/lndCreateInvoice.js index 68485855a..81a1de9a9 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,11 @@ const LNDCreateInvoice = () => { const renderCreateButton = () => { return ( - {isLoading ? :