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

hotfix: breaking Next server #383

Merged
merged 2 commits into from
Oct 2, 2024
Merged

hotfix: breaking Next server #383

merged 2 commits into from
Oct 2, 2024

Conversation

mohandast52
Copy link
Collaborator

@mohandast52 mohandast52 commented Oct 2, 2024

Proposed changes

  • @truemiller's commit from OTA changes for the hotfix.

Types of changes

What types of changes does your code introduce?
Put an x in the boxes that apply

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

@mohandast52 mohandast52 added the bug Something isn't working label Oct 2, 2024
@mohandast52 mohandast52 self-assigned this Oct 2, 2024
electron/main.js Outdated Show resolved Hide resolved
Co-authored-by: Josh Miller <[email protected]>
@mohandast52 mohandast52 marked this pull request as ready for review October 2, 2024 09:22
const nextApp = next({
dev: false,
dir: path.join(__dirname),
port: appConfig.ports.prod.next,
Copy link
Collaborator

@truemiller truemiller Oct 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just for context, port and env were removed as:

  • next port is handled by the http server that handles the next requests, not this next instance
  • env as was previously defined was invalid config

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mohandast52 mohandast52 merged commit 0d6f242 into main Oct 2, 2024
4 checks passed
@mohandast52 mohandast52 deleted the hotfix/next-server branch October 2, 2024 09:47
mohandast52 added a commit that referenced this pull request Oct 2, 2024
* fix: nextApp fix in main.js

* Update electron/main.js



---------

Co-authored-by: Josh Miller <[email protected]>
mohandast52 added a commit that referenced this pull request Oct 2, 2024
* feat: Implement UX improvements on rewards (#372)

* fix: tray icon click, refactor for better DX around tray

* fix: further nullish fallbacks

* release: rc136

* fix: allowlist evm public keys in gitleaks CI

* fix: updated for correct version

* fix: edit [allowlist] regexes

* fix: seperate allowlist for ignore evm pub keys

* fix: make global allowlist array

* fix: make allowlists singular

* fix: combine allowlists

* fix: use word boundaries

* feat: refactor pearl tray

* chore: delete old tray icons file

* fix: use enum

* bump: rc140

* fix: missing resize

* chore: add electron.logger

* fix: setTemplateImage for macOS tray icon

* docs: updated docs

* fix: missing setTemplateImage

* fix: links

* fix: only bind click events for windows (linux/mac do not support)

* bump: rc142

* feat: Implement UX improvements on balances (#362)

* feat: add constant for modal width

* feat: add CustomModal component

* feat: update modal width to use constant

* feat: add AccountBalanceDetails dummy component

* feat: add dummy OlasBalance in  AccountBalanceDetails component

* feat: add dummy XdaoBalance in  AccountBalanceDetails component

* Add YourWallet and Signer component

* Add YourAgentWallet component

* feat: add a button to trigger the modal

* feat: remove comments code for balance

* feat: integrate wallet address

* feat: add signer, balances and update InfoBreakdown component

* feat: extract Signer header

* feat: add agent details

* feat: as per new design

* feat: update images

* feat: Remove current balance tooltip

* feat: renames

* feat: replace icon with 'See breakdown' text

* feat: Update account balance to include EOA xDAI for AccountBalances.tsx and YourAgent.tsx

* feat: Compliance review comments (#366)

* feat: update backup wallet message for clarity

* remove: do not add more funds line

* fix: 'This enables you to' -> 'you may recover your funds to your backup wallet if you lose ....'

* feat: 'may' not 'can'

* feat: 'Note that the backup wallet feature is not designed to restore access to your Pearl account but rather the funds ...'

* feat: 'to avoid missing targets'

* feat: Change to 'Your agent is at risk of missing its targets, which would result in several days' suspension.'

* feat: Change to 'to be eligible for...' and Add ','

* feat: Change to 'Estimated Annual Percentage Yield (APY)'. Implement it across'

* feat: Remove 'will' https

* fix: broken .nvmrc

* fix: stops build warning

* fix: removed macUpdater listener, keeps firing after changing options

* refactor: moved macUpdater event from main (clutter)

* fix: use app.getAppPath, __dirname doesn't work in subdirectories

* fix: return

* feat: display last transaction with a 1-minute delay – persists even after navigating to other pages (#365)

* feat: add a hook to delay 1 minute to show last transaction

* changes

* feat: update logic

* release: rc143

* fix: missing `?`

* feat: add win32 dev build

* feat: UI of nested wallets in new Wallet screen (#368)

* feat: update 'Address' component

* feat: directory rename

* feat: remove modal and create a different page for 'Your wallet'

* feat: restructure Component order

* fix: update tray icons & add retina images

* feat: Show scrollbar when the content is taller that then window (#369)

* feat: try with account-balances modal

* feat: add scrollbar css globally

* add scroll to botton on 'Add funds' click & add global scroll

* feat: minor scroll-bar update

* refactor: Add delay utility function for code readability

* feat: hide body scroll and enable for main card

* feat: add scroll to body

* feat: fixed topbar

* feat: init rewards history

* feat: add design changes and mock

* feat: fix style component warning and add queryClient

* feat: integrate graphQL query to fetch rewards history

* feat: add actual query (used in studio)

* feat: remove comment

* feat: update naming

* feat: use epochLength

* feat: update color

* feat: add zod

* feat: package change

* feat: move date utils to time folder

* feat: address Tanya review changes

* feat: Add @tanstack/react-query and zod packages in electron package.json

* feat: rewards history logic (#378)

* feat: if there are no rewards, do not show the contract info altogether

* chore: lots of tries

* feat: hardcode the timestamp and ignore previous ones

* feat: remove own comment for understading

* feat: fetch service staked info

* feat: add logic to get the staked time

* feat: trying with serviceInfo.tsStart but no success

* feat: use epoch 0 timestamp logic

* feat: add comments

---------

Co-authored-by: truemiller <[email protected]>
Co-authored-by: Josh Miller <[email protected]>

* fix: minor (#382)

* fix: update dev rpc on the release

* release: rc155

* hotfix: breaking Next server (#383) (#384)

* fix: nextApp fix in main.js

* Update electron/main.js



---------

Co-authored-by: Josh Miller <[email protected]>

* feat: bump to rc158

---------

Co-authored-by: truemiller <[email protected]>
Co-authored-by: Josh Miller <[email protected]>
Co-authored-by: Ardian <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants