fix: Fix import config button crash #512
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Was about to send a fix for this, didn't notice you had one already @gmaclennan. Also added the pt translations so we don't need to wait for Crowdin translation updates. Looks good to me, will merge once checks pass. |
luandro
force-pushed
the
fix/project-config-button
branch
from
c6bd51b
to
1530e4d
Compare
|
💯 |
|
Should I delete the branch after merge? |
Merged
gmaclennan
added a commit
that referenced
this pull request
Apr 20, 2021
* develop: feat: Setting to choose coordinate display format (#526) chore: Re-apply c267a99 with correct npm@6 version and lockfile v1 Revert "feat: Updated translations for default configuration (vi, srn)" feat: Updated translations for default configuration (vi, srn) fix: Update Thai, Khmer & Vietnamese translations feat: Add Dutch translations feat: Add Sranan Tongo translations feat: Add French translations fix: Fix cutoff of text on OnePlus6T phone #502 (#511) fix: Write preset tags to observations (#514) chore: Fix Github CI builds by removing NDK r22 (#516) fix: Fix import config button crash (#512) feat: Updated translations (vi, es, po) (#498) # Conflicts: # src/backend/package-lock.json # src/backend/package.json # src/frontend/screens/Settings/Settings.js
gmaclennan
added a commit
that referenced
this pull request
Apr 29, 2021
* chore: Fix redirect created when a new version is released Previous link was broken * chore: Remove untranslated strings from messages (#496) Reduces memory use and APK size * chore(CI): Update JDK setup action (#505) * note to use specific ndk version * chore: Improve contributor docs (#509) * chore: Added instructions to build translations and run the Javascript bundler prior to building for Android * chore: Added instructions for downloading and preparing offline maps wth the needed structure * chore: Add detailed instructions on how to download maps and add them to phone * chore: Add note about react-native run-android not opening bundler on all machines * chore: Add note about com.mapeo changing with different release versions * chore: Change asar to full flag name * fix: Localize "Import Config" button (#510) * fix: Change hardcoded message to intl FormattedMessage * Add missing string to translations * chore: prettier * extract messages Co-authored-by: Gregor MacLennan <[email protected]> * feat: Updated translations (vi, es, po) (#498) * New translations en.json (Vietnamese) * New translations en.json (Vietnamese) * New translations en.json (Vietnamese) * New translations en.json (Portuguese, Brazilian) * New translations en.json (Portuguese, Brazilian) * New translations en.json (Portuguese, Brazilian) * New translations en.json (Spanish) * New translations en.json (Portuguese, Brazilian) Co-authored-by: Gregor MacLennan <[email protected]> * fix: Fix import config button crash (#512) * fix: Fix import config button crash * Update version in package-lock Co-authored-by: luandro <[email protected]> * chore: Fix Github CI builds by removing NDK r22 (#516) See #517 for explanation An update to the Github Action virtual environment added NDK r22, which CMake uses, ignoring $ANDROID_NDK_HOME. Solution: Remove NDK r22 and update to latest NDK r21f * fix: Write preset tags to observations (#514) * fix: Add better variable naming and easier to understand logic * fix: Cleaner and easier to understand logic on updating tags * fix: Clean redundant code and sort updated value order in preparation for edge cases * fix: Fix cutoff of text on OnePlus6T phone #502 (#511) * fix: Fix cutoff of text on OnePlus6T phone #502 Use a custom Text component with fontFamily explicitly set, to work around bug facebook/react-native#15114 (comment) * Fix implementation of style merging * fix bugs * feat: Add French translations * feat: Add Sranan Tongo translations * feat: Add Dutch translations * fix: Update Thai, Khmer & Vietnamese translations * feat: Updated translations for default configuration (vi, srn) * Revert "feat: Updated translations for default configuration (vi, srn)" This reverts commit c267a99. Install was done using npm@7 which changed the package-lock format and broke the build * chore: Re-apply c267a99 with correct npm@6 version and lockfile v1 * chore: Prepare release v5.2.0 Co-authored-by: Kira Oakley <[email protected]> Co-authored-by: luandro <[email protected]> Co-authored-by: Digidem Bot <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The
<Button>component currently expects children to be a string, so it doesn't wrap<FormattedMessage>in a<Text>component. We need to fix<Button>but this is a short-term fix.