Skip to content
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

Conversation

erinleigh90
Copy link
Contributor

Description of changes

Merge and resolve changes from main into main feature branch

Description of how you validated changes

yarn build and test

Checklist

  • PR description included
  • yarn test passes

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

cshfang and others added 30 commits February 10, 2023 11:33
…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
aws-amplify-bot and others added 20 commits April 13, 2023 00:42
* 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>
@erinleigh90 erinleigh90 requested review from a team as code owners April 20, 2023 20:29
Copy link
Contributor

@jimblanc jimblanc left a 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.

packages/core/src/Platform/types.ts Show resolved Hide resolved
@erinleigh90 erinleigh90 merged commit 65bf314 into aws-amplify:feat/user-agent-enhancements/main Apr 20, 2023
1 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet