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.

Sign up for GitHub

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

Jump to bottom

Preview #199

Merged
merged 35 commits into from
Apr 26, 2024
Merged

Preview #199

merged 35 commits into from
Apr 26, 2024

Commits on Apr 20, 2024

  1. remove wallet loading

    @MickWang
    MickWang committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    4b6bec0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #153 from zkLinkProtocol/feat/remove_wallet_loading 

    remove wallet loading
    @zkLeonardo
    zkLeonardo authored Apr 20, 2024
    Configuration menu
    Copy the full SHA
    bc5829a View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2024

  1. Merge pull request #158 from zkLinkProtocol/feat/failed_deposit_history 

    Feat/failed deposit history
    @zkLeonardo
    zkLeonardo authored Apr 22, 2024
    Configuration menu
    Copy the full SHA
    6a6a375 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feat/merge_main_dev

    @MickWang
    MickWang committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    63f4330 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' into feat/merge_main_dev

    @MickWang
    MickWang authored Apr 22, 2024
    Configuration menu
    Copy the full SHA
    2e32558 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #162 from zkLinkProtocol/feat/merge_main_dev 

    Feat/merge main dev
    @haymond-ZK
    haymond-ZK authored Apr 22, 2024
    Configuration menu
    Copy the full SHA
    f8a23c7 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into feat/withdraw_claimable_status

    @MickWang
    MickWang committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    06e4a79 View commit details
    Browse the repository at this point in the history

  6. update claimable status for withdrawal

    @MickWang
    MickWang committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    c32ea58 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2024

  1. update for withdrawal cliamable and claimed status

    @MickWang
    MickWang committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    a7e4cd6 View commit details
    Browse the repository at this point in the history

  2. update withdrawal history chain name issue

    @MickWang
    MickWang committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    fc6d845 View commit details
    Browse the repository at this point in the history

  3. fix estimate fee for claim

    @MickWang
    MickWang committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    0615ff9 View commit details
    Browse the repository at this point in the history

  4. fix estimate fee issue for claim

    @MickWang
    MickWang committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    93db654 View commit details
    Browse the repository at this point in the history

  5. check claimable status for tx in storage

    @MickWang
    MickWang committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    d5962a6 View commit details
    Browse the repository at this point in the history

  6. display claimed withdrawal tx in completed transfers

    @MickWang
    MickWang committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    242137c View commit details
    Browse the repository at this point in the history

  7. add delay limit for check claimable status

    @MickWang
    MickWang committed Apr 23, 2024
    Configuration menu
    Copy the full SHA
    f3b8bcc View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. Merge pull request #177 from zkLinkProtocol/feature-add-third 

    fix: change style
    @MickWang
    MickWang authored Apr 24, 2024
    Configuration menu
    Copy the full SHA
    c6fdf65 View commit details
    Browse the repository at this point in the history

  2. add zklink contract eth balance check for claimable status

    @MickWang
    MickWang committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    e270c7b View commit details
    Browse the repository at this point in the history

  3. fix estimate fee for claim withdrawal

    @MickWang
    MickWang committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    6981f82 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #182 from zkLinkProtocol/feat/withdraw_estimate_time 

    update timer days display
    @zkLeonardo
    zkLeonardo authored Apr 24, 2024
    Configuration menu
    Copy the full SHA
    88dbbcc View commit details
    Browse the repository at this point in the history

  5. Merge pull request #183 from zkLinkProtocol/feat/failed_deposit_history 

    Feat/failed deposit history
    @zkLeonardo
    zkLeonardo authored Apr 24, 2024
    Configuration menu
    Copy the full SHA
    14bdb44 View commit details
    Browse the repository at this point in the history

  6. add wait receipt for withdraw tx

    @MickWang
    MickWang committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    60d1189 View commit details
    Browse the repository at this point in the history

  7. fix publicent error

    @MickWang
    MickWang committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    0a96560 View commit details
    Browse the repository at this point in the history

  8. update merge token portal contract

    @MickWang
    MickWang committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    80139f9 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2024

  1. remove wallet connect loading

    @MickWang
    MickWang committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    eb408f6 View commit details
    Browse the repository at this point in the history

  2. add h5 debugger

    @MickWang
    MickWang committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    61e23de View commit details
    Browse the repository at this point in the history

  3. update withdrawal tx for local storage missing

    @MickWang
    MickWang committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    e778159 View commit details
    Browse the repository at this point in the history

  4. add reload merge token info

    @MickWang
    MickWang committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    45dd3d4 View commit details
    Browse the repository at this point in the history

  5. fix conflicts

    @MickWang
    MickWang committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    6949287 View commit details
    Browse the repository at this point in the history

  6. update conmment

    @MickWang
    MickWang committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    a204d74 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #192 from zkLinkProtocol/feat/withdraw_claimable_s… 

    …tatus

Feat/withdraw claimable status
    @zkLeonardo
    zkLeonardo authored Apr 25, 2024
    Configuration menu
    Copy the full SHA
    cf148e7 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. Merge pull request #196 from zkLinkProtocol/feat/debug_mobile_loading 

    add h5 debugger
    @zkLeonardo
    zkLeonardo authored Apr 26, 2024
    Configuration menu
    Copy the full SHA
    ce8259a View commit details
    Browse the repository at this point in the history

  2. fix rumtime error on okx app

    @MickWang
    MickWang committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    7fe2667 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #197 from zkLinkProtocol/feat/withdraw_claimable_s… 

    …tatus

fix rumtime error on okx app
    @zkLeonardo
    zkLeonardo authored Apr 26, 2024
    Configuration menu
    Copy the full SHA
    be9d35d View commit details
    Browse the repository at this point in the history

  4. hide h5 debugger

    @MickWang
    MickWang committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    05bd0f6 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #198 from zkLinkProtocol/feat/debug_mobile_loading 

    hide h5 debugger
    @zkLeonardo
    zkLeonardo authored Apr 26, 2024
    Configuration menu
    Copy the full SHA
    9a2eac4 View commit details
    Browse the repository at this point in the history