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

Remove merge markers. Remove duplicate code in analytics service. Rem… #104

Merged
merged 1 commit into from
Aug 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions Assets/Helika/Packages/KochavaAppleTracking.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions Assets/TestsBasic/IntegrationTests.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions Assets/TestsBasic/TestHelpers.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions Assets/Treasure/Example/Scripts/MagicswapUI.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions Assets/Treasure/TDK/Runtime/API/Magicswap.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions Assets/Treasure/TDK/Runtime/Infrastructure/TDKBaseService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ namespace Treasure
// why do we need empty game objects for services? it could be independent from unity
public class TDKBaseService : MonoBehaviour
{
protected bool appIsQuitting = false;

public virtual void Awake()
{
DontDestroyOnLoad(this);
Expand Down
4 changes: 0 additions & 4 deletions Assets/Treasure/TDK/Runtime/Magicswap.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,6 @@ public void TrackEvent(string eventName, Dictionary<string, object> eventProps =
// add chain id (using indexer in case it was added upstream)
eventProps[AnalyticsConstants.PROP_CHAIN_ID] = _chainId;

eventProps.Add(AnalyticsConstants.PROP_TDK_VERSION, TDKVersion.version);
eventProps.Add(AnalyticsConstants.PROP_TDK_FLAVOUR, TDKVersion.name);
eventProps.Add(AnalyticsConstants.PROP_APP_ENVIRONMENT, TDK.AppConfig.Environment);

// add chain id (using indexer in case it was added upstream)
eventProps[AnalyticsConstants.PROP_CHAIN_ID] = _chainId;

EventManager.Instance.SendEvent(eventName, eventProps);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ public override void Awake()
#if !UNITY_WEBGL
void OnApplicationQuit()
{
appIsQuitting = true;
TerminateCacheFlushing();
}
#endif
Expand Down