Merge branch 'aopp-accountcode'

Author: benma

backend/aopp.go

@@ -86,6 +86,9 @@ type AOPP struct {
 	ErrorCode ErrorCode `json:"errorCode"`
 	// Accounts is the list of accounts the user can choose from. Only applies if State == aoppStateChoosingAccount.
 	Accounts []account `json:"accounts"`
+	// AccountCode is the code of the chosen account from which an address will be taken. Only
+	// applies for states after (and excluding) `aoppStateChoosingAccount`.
+	AccountCode accounts.Code `json:"accountCode"`
 	// Address that will be delivered to the requesting party via the callback. Only applies if
 	// State == aoppStateSigning or aoppStateSuccess.
 	Address string `json:"address"`
@@ -266,6 +269,7 @@ func (backend *Backend) aoppChooseAccount(code accounts.Code) {
 		return
 	}
 
+	backend.aopp.AccountCode = code
 	backend.aopp.State = aoppStateSyncing
 	backend.notifyAOPP()
 

backend/aopp_test.go

@@ -221,12 +221,13 @@ func TestAOPPSuccess(t *testing.T) {
 						{Name: test.accountName, Code: test.accountCode},
 						{Name: "Second account", Code: regularAccountCode(rootFingerprint, test.coinCode, 1)},
 					},
-					Address:   test.address,
-					AddressID: test.addressID,
-					Callback:  callback,
-					Message:   dummyMsg,
-					coinCode:  test.coinCode,
-					format:    test.format,
+					AccountCode: test.accountCode,
+					Address:     test.address,
+					AddressID:   test.addressID,
+					Callback:    callback,
+					Message:     dummyMsg,
+					coinCode:    test.coinCode,
+					format:      test.format,
 				},
 				b.AOPP(),
 			)

frontends/web/src/api/aopp.ts

@@ -47,6 +47,7 @@ export type Aopp = {
     addressID: string;
     message: string;
     callback: string;
+    accountCode: AccountCode;
 };
 
 export const cancel = (): Promise<null> => {

frontends/web/src/components/aopp/aopp.tsx

@@ -228,7 +228,7 @@ class Aopp extends Component<Props, State> {
                         <FullscreenButtons>
                             <Button primary onClick={aoppAPI.cancel}>{t('button.done')}</Button>
                             <VerifyAddress
-                                accountCode={accountCode}
+                                accountCode={aopp.accountCode}
                                 address={aopp.address}
                                 addressID={aopp.addressID} />
                         </FullscreenButtons>