-
Notifications
You must be signed in to change notification settings - Fork 2.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
chore: merge changes from main and resolve conflicts #11279
Merged
erinleigh90
merged 126 commits into
aws-amplify:feat/user-agent-enhancements/main
from
erinleigh90:feat/user-agent-enhancements/main
Apr 20, 2023
Merged
chore: merge changes from main and resolve conflicts #11279
erinleigh90
merged 126 commits into
aws-amplify:feat/user-agent-enhancements/main
from
erinleigh90:feat/user-agent-enhancements/main
Apr 20, 2023
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
…ws-amplify#10945) * feat(notifications): Add base React Native module package for Push Notification * Remove mavenLocal from build.gradle * Remove local properties from version control
* chore(notifications): Extract common functionalities * Remove data from common provider debug logs * Remove export * from eventListener index
…y#10948) * feat(notifications): Android native module implementation * Add comment for default timeout * Also log error in getLaunchActivityClass if class name is not defined * Cancel coroutine scope on module destroy * Addressed various comments
* feat(notifications): Add Push Notification * Added timeout condition to iOS background tasks * Moved symbol to common and extracted user agent function * Destructure native events to improve readability * Reduce token emit frequency * Revert destructuring addListener * Fixed issue with analytics recording * Bump size limit for new feature
* feat(notifications): Add getPermissionStatus API * Un-destructure native module for better clarity
feat(notifications): Attach url or deep link to getInitialUrl
* chore(notifications): Export public types * Convert PushNotificationEvent to const enum
* feat(pn): add push notification ios native module * Resolve authorization status as string * Remove unnecessary #avaialble check * Resolve comments * Remove expose isBackgroundMode as react-native initial prop * Make requestPermissions resolve boolean * emit launchNotificationOpened event * fix completionHandlerId is not being sent
…fy#11011) * fix(pn): wrong launchNotificationOpened constant exporting * fix(notifications): registerForRemoteNotifications may not be called on App launching * feat(notifications): expose getPermissionStatus via RCTBridge * fix(notifications): AmplifyRTNPushNotificationManager init later than expected * Add missing method
* chore(notifications): Integrate iOS native module * Allow variable be undefined instead of null
* feat(notifications): Add init API * Extract isEnabled guard to common function
…ws-amplify#11076) * fix(notifications): update iOS launch notification determining logic * Fix comments
* fix: Testing synchronous PN initialization. * Fix deployment targets. * Disable test. * Deleted npmrc file. * Fixed test. * Re-ordered dependencies. * Re-organize PN initialization. * Fix unit test * Remove temporary items from config * Move Push instantiation into Notification constructor * fix(notifications): Instantiate Push only once but not in the constructor --------- Co-authored-by: Jim Blanchard <jablanch@amazon.com> Co-authored-by: Francisco Rodriguez <frodriguez.cs@gmail.com>
… Update sync processor to log errors on retry; update fake GraphQL service to extract singular name of model when parsing queries, and update broken RegEx; update connectivity handling unit test to fail on all errors (aws-amplify#11261) fix(data): sync processor, fake GraphQL service, and unit test fixes. Update sync processor to log errors on retry; update fake GraphQL service to extract singular name of model when parsing queries, and update broken RegEx; update connectivity handling unit test to fail on all errors
- @aws-amplify/analytics@6.0.28 - @aws-amplify/api-graphql@3.1.16 - @aws-amplify/api-rest@3.0.28 - @aws-amplify/api@5.0.28 - @aws-amplify/auth@5.3.2 - aws-amplify@5.1.2 - @aws-amplify/cache@5.0.28 - @aws-amplify/core@5.1.11 - @aws-amplify/datastore-storage-adapter@2.0.28 - @aws-amplify/datastore@4.1.10 - @aws-amplify/geo@2.0.28 - @aws-amplify/interactions@5.0.28 - @aws-amplify/notifications@1.1.2 - @aws-amplify/predictions@5.1.2 - @aws-amplify/pubsub@5.1.11 - @aws-amplify/pushnotification@5.0.28 - @aws-amplify/rtn-push-notification@1.1.1 - @aws-amplify/storage@5.2.2 - @aws-amplify/xr@4.0.28
aws-amplify#10499) * feat: add github action to automatically remove pending-response label * chore: scope GITHUB_TOKEN to only issue write permissions * Update .github/workflows/issue-pending-response.yml Co-authored-by: Jim Blanchard <jim.l.blanchard@gmail.com> --------- Co-authored-by: Aaron S <94858815+stocaaro@users.noreply.github.com> Co-authored-by: Jim Blanchard <jim.l.blanchard@gmail.com>
stocaaro
approved these changes
Apr 20, 2023
jimblanc
approved these changes
Apr 20, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, question below about the merge conflict resolution. Also recommend merging this as a merge-commit once approved instead of squashing.
…tions and inappmessaging
erinleigh90
merged commit Apr 20, 2023
65bf314
into
aws-amplify:feat/user-agent-enhancements/main
1 of 2 checks passed
3 tasks
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.
Description of changes
Merge and resolve changes from main into main feature branch
Description of how you validated changes
yarn build and test
Checklist
yarn test
passesBy submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.